Xinqi Bao's Git

projects / st.git / blobdiff
summary | log | commit | diff | tree
raw | inline | side by side
removed old VT52 escapes, fixed VT100 IND.
[st.git] / st.c
diff --git a/st.c b/st.c
old mode 100755 (executable)
new mode 100644 (file)
index db5e04f..6a51581
--- a/st.c
+++ b/st.c
@@ -20,7 +20,13 @@
 #include <X11/keysym.h>
 #include <X11/Xutil.h>
 
 #include <X11/keysym.h>
 #include <X11/Xutil.h>
 
-#define TNAME "xterm"
+#if   defined(LINUX)
+ #include <pty.h>
+#elif defined(OPENBSD)
+ #include <util.h>
+#elif defined(FREEBSD)
+ #include <libutil.h>
+#endif
 
 /* Arbitrary sizes */
 #define ESC_TITLE_SIZ 256
 
 /* Arbitrary sizes */
 #define ESC_TITLE_SIZ 256
@@ -36,10 +42,12 @@
 #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 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))
 
 /* 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 };
-enum { CURSOR_UP, CURSOR_DOWN, CURSOR_LEFT, CURSOR_RIGHT, CURSOR_HIDE, CURSOR_DRAW, CURSOR_SAVE, CURSOR_LOAD };
+enum { CURSOR_UP, CURSOR_DOWN, CURSOR_LEFT, CURSOR_RIGHT, CURSOR_HIDE = 1, 
+       CURSOR_DRAW = 0, CURSOR_SAVE, CURSOR_LOAD };
 enum { GLYPH_SET=1, GLYPH_DIRTY=2 };
 enum { MODE_WRAP=1, MODE_INSERT=2, MODE_APPKEYPAD=4 };
 enum { ESC_START=1, ESC_CSI=2, ESC_OSC=4, ESC_TITLE=8, ESC_ALTCHARSET=16 };
 enum { GLYPH_SET=1, GLYPH_DIRTY=2 };
 enum { MODE_WRAP=1, MODE_INSERT=2, MODE_APPKEYPAD=4 };
 enum { ESC_START=1, ESC_CSI=2, ESC_OSC=4, ESC_TITLE=8, ESC_ALTCHARSET=16 };
@@ -59,6 +67,7 @@ typedef struct {
        Glyph attr;      /* current char attributes */
        int x;
        int y;
        Glyph attr;      /* current char attributes */
        int x;
        int y;
+       char hide;
 } TCursor;
 
 /* CSI Escape sequence structs */
 } TCursor;
 
 /* CSI Escape sequence structs */
@@ -78,7 +87,6 @@ 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 */
@@ -106,16 +114,16 @@ typedef struct {
        char s[ESC_BUF_SIZ];
 } Key;
 
        char s[ESC_BUF_SIZ];
 } Key;
 
-#include "config.h"
-
 /* Drawing Context */
 typedef struct {
 /* Drawing Context */
 typedef struct {
-       unsigned long col[LEN(colorname)];
+       unsigned long col[256];
        XFontStruct* font;
        XFontStruct* bfont;
        GC gc;
 } DC;
 
        XFontStruct* font;
        XFontStruct* bfont;
        GC gc;
 } DC;
 
+#include "config.h"
+
 static void die(const char *errstr, ...);
 static void draw(int);
 static void execsh(void);
 static void die(const char *errstr, ...);
 static void draw(int);
 static void execsh(void);
@@ -129,7 +137,6 @@ static void csireset(void);
 
 static void tclearregion(int, int, int, int);
 static void tcursor(int);
 
 static void tclearregion(int, int, int, int);
 static void tcursor(int);
-static void tmovecursor(int);
 static void tdeletechar(int);
 static void tdeleteline(int);
 static void tinsertblank(int);
 static void tdeletechar(int);
 static void tdeleteline(int);
 static void tinsertblank(int);
@@ -137,11 +144,11 @@ static void tinsertblankline(int);
 static void tmoveto(int, int);
 static void tnew(int, int);
 static void tnewline(void);
 static void tmoveto(int, int);
 static void tnew(int, int);
 static void tnewline(void);
+static void tputtab(void);
 static void tputc(char);
 static void tputs(char*, int);
 static void treset(void);
 static void tresize(int, int);
 static void tputc(char);
 static void tputs(char*, int);
 static void treset(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 tscrollup(int);
 static void tscrolldown(int);
 static void tsetattr(int*, int);
@@ -153,10 +160,13 @@ static void ttyread(void);
 static void ttyresize(int, int);
 static void ttywrite(const char *, size_t);
 
 static void ttyresize(int, int);
 static void ttywrite(const char *, size_t);
 
-static unsigned long xgetcol(const char *);
+static void xbell(void);
+static void xdraws(char *, Glyph, int, int, int);
+static void xhints(void);
 static void xclear(int, int, int, int);
 static void xcursor(int);
 static void xinit(void);
 static void xclear(int, int, int, int);
 static void xcursor(int);
 static void xinit(void);
+static void xloadcols(void);
 
 static void expose(XEvent *);
 static char* kmap(KeySym);
 
 static void expose(XEvent *);
 static char* kmap(KeySym);
@@ -211,17 +221,17 @@ die(const char *errstr, ...) {
 void
 execsh(void) {
        char *args[3] = {getenv("SHELL"), "-i", NULL};
 void
 execsh(void) {
        char *args[3] = {getenv("SHELL"), "-i", NULL};
-       DEFAULT(args[0], "/bin/sh"); /* default shell if getenv() failed */
+       DEFAULT(args[0], "/bin/sh"); /* if getenv() failed */
        putenv("TERM=" TNAME);
        execvp(args[0], args);
 }
 
 void
        putenv("TERM=" TNAME);
        execvp(args[0], args);
 }
 
 void
-xbell(void) { /* visual bell */
-       XRectangle r = { BORDER, BORDER, xw.bufw, xw.bufh };
+xbell(void) {
        XSetForeground(xw.dis, dc.gc, dc.col[BellCol]);
        XSetForeground(xw.dis, dc.gc, dc.col[BellCol]);
-       XFillRectangles(xw.dis, xw.win, dc.gc, &r, 1);
-       /* usleep(30000); */
+       XFillRectangle(xw.dis, xw.win, dc.gc, BORDER, BORDER, xw.bufw, xw.bufh);
+       XFlush(xw.dis);
+       usleep(BellTime);
        draw(SCREEN_REDRAW);
 }
 
        draw(SCREEN_REDRAW);
 }
 
@@ -239,19 +249,12 @@ sigchld(int a) {
 void
 ttynew(void) {
        int m, s;
 void
 ttynew(void) {
        int m, s;
-       char *pts;
-
-       if((m = posix_openpt(O_RDWR | O_NOCTTY)) < 0)
-               die("openpt failed: %s\n", SERRNO);
-       if(grantpt(m) < 0)
-               die("grandpt failed: %s\n", SERRNO);
-       if(unlockpt(m) < 0)
-               die("unlockpt failed: %s\n", SERRNO);
-       if(!(pts = ptsname(m)))
-               die("ptsname failed: %s\n", SERRNO);
-       if((s = open(pts, O_RDWR | O_NOCTTY)) < 0)
-               die("Couldn't open slave: %s\n", SERRNO);
-       fcntl(s, F_SETFL, O_NDELAY);
+       
+       /* seems to work fine on linux, openbsd and freebsd */
+       struct winsize w = {term.row, term.col, 0, 0};
+       if(openpty(&m, &s, NULL, NULL, &w) < 0)
+               die("openpty failed: %s\n", SERRNO);
+
        switch(pid = fork()) {
        case -1:
                die("fork failed\n");
        switch(pid = fork()) {
        case -1:
                die("fork failed\n");
@@ -262,7 +265,9 @@ ttynew(void) {
                dup2(s, STDOUT_FILENO);
                dup2(s, STDERR_FILENO);
                if(ioctl(s, TIOCSCTTY, NULL) < 0)
                dup2(s, STDOUT_FILENO);
                dup2(s, STDERR_FILENO);
                if(ioctl(s, TIOCSCTTY, NULL) < 0)
-                       die("ioctl TTIOCSTTY failed: %s\n", SERRNO);
+                       die("ioctl TIOCSCTTY failed: %s\n", SERRNO);
+               close(s);
+               close(m);
                execsh();
                break;
        default:
                execsh();
                break;
        default:
@@ -320,44 +325,26 @@ tcursor(int mode) {
 
 void
 treset(void) {
 
 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.c = (TCursor){{
+               .mode = ATTR_NULL, 
+               .fg = DefaultFG, 
+               .bg = DefaultBG
+       }, .x = 0, .y = 0, .hide = 0};
+       
        term.top = 0, term.bot = term.row - 1;
        term.mode = MODE_WRAP;
        tclearregion(0, 0, term.col-1, term.row-1);
 }
 
 void
        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 */
+tnew(int col, int row) {
+       /* set screen size */
        term.row = row, term.col = col;
        term.row = row, term.col = col;
-       term.top = 0, term.bot = term.row - 1;
-       /* mode */
-       term.mode = MODE_WRAP;
-       /* cursor */
-       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;
-       /* allocate screen */
-       term.line = calloc(term.row, sizeof(Line));
+       term.line = malloc(term.row * sizeof(Line));
        for(row = 0 ; row < term.row; row++)
        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;
-
-       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;
+               term.line[row] = malloc(term.col * sizeof(Glyph));
+       /* setup screen */
+       treset();
 }
 
 void
 }
 
 void
@@ -386,18 +373,18 @@ tscrollup (int n) {
        for(i = 0; i < n; i++)
                memset(term.line[term.top+i], 0, term.col*sizeof(Glyph));
        
        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++) { 
+       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;
                 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;
        if(y > term.bot)
 }
 
 void
 tnewline(void) {
        int y = term.c.y + 1;
        if(y > term.bot)
-               tscroll(), y = term.bot;
+               tscrollup(1), y = term.bot;
        tmoveto(0, y);
 }
 
        tmoveto(0, y);
 }
 
@@ -431,37 +418,6 @@ tmoveto(int x, int y) {
        term.c.y = y < 0 ? 0 : y >= term.row ? term.row-1 : y;
 }
 
        term.c.y = y < 0 ? 0 : y >= term.row ? term.row-1 : y;
 }
 
-void
-tmovecursor(int dir) {
-       int xf = term.c.x, yf = term.c.y;
-       
-       switch(dir) {
-       case CURSOR_UP:
-               yf--;
-               break;
-       case CURSOR_DOWN:
-               yf++;
-               break;
-       case CURSOR_LEFT:
-               xf--;
-               if(term.mode & MODE_WRAP && xf < 0) {
-                       xf = term.col-1, yf--;
-                       if(yf < term.top)
-                               yf = term.top, xf = 0;
-               }
-               break;
-       case CURSOR_RIGHT:
-               xf++;
-               if(term.mode & MODE_WRAP && xf >= term.col) {
-                       xf = 0, yf++;
-                       if(yf > term.bot)
-                               yf = term.bot, tscroll();
-               }
-               break;
-       }
-       tmoveto(xf, yf);
-}
-       
 void
 tsetchar(char c) {
        term.line[term.c.y][term.c.x] = term.c.attr;
 void
 tsetchar(char c) {
        term.line[term.c.y][term.c.x] = term.c.attr;
@@ -498,21 +454,21 @@ tdeletechar(int n) {
                return;
        }
        memmove(&term.line[term.c.y][dst], &term.line[term.c.y][src], size * sizeof(Glyph));
                return;
        }
        memmove(&term.line[term.c.y][dst], &term.line[term.c.y][src], size * sizeof(Glyph));
-       tclearregion(term.col-size, term.c.y, term.col-1, term.c.y);
+       tclearregion(term.col-n, term.c.y, term.col-1, term.c.y);
 }
 
 void
 tinsertblank(int n) {
        int src = term.c.x;
        int dst = src + n;
 }
 
 void
 tinsertblank(int n) {
        int src = term.c.x;
        int dst = src + n;
-       int size = term.col - n - src;
+       int size = term.col - dst;
 
        if(dst >= term.col) {
                tclearregion(term.c.x, term.c.y, term.col-1, term.c.y);
                return;
        }
        memmove(&term.line[term.c.y][dst], &term.line[term.c.y][src], size * sizeof(Glyph));
 
        if(dst >= term.col) {
                tclearregion(term.c.x, term.c.y, term.col-1, term.c.y);
                return;
        }
        memmove(&term.line[term.c.y][dst], &term.line[term.c.y][src], size * sizeof(Glyph));
-       tclearregion(src, term.c.y, dst, term.c.y);
+       tclearregion(src, term.c.y, dst - 1, term.c.y);
 }
 
 void
 }
 
 void
@@ -592,19 +548,45 @@ tsetattr(int *attr, int l) {
                case 27: 
                        term.c.attr.mode &= ~ATTR_REVERSE;       
                        break;
                case 27: 
                        term.c.attr.mode &= ~ATTR_REVERSE;       
                        break;
+               case 38:
+                       if (i + 2 < l && attr[i + 1] == 5) {
+                               i += 2;
+                               if (BETWEEN(attr[i], 0, 255))
+                                       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]); 
+                       break;
                case 39:
                        term.c.attr.fg = DefaultFG;
                        break;
                case 39:
                        term.c.attr.fg = DefaultFG;
                        break;
+               case 48:
+                       if (i + 2 < l && attr[i + 1] == 5) {
+                               i += 2;
+                               if (BETWEEN(attr[i], 0, 255))
+                                       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]); 
+                       break;
                case 49:
                case 49:
-                       term.c.attr.fg = DefaultBG;
+                       term.c.attr.bg = DefaultBG;
                        break;
                default:
                        if(BETWEEN(attr[i], 30, 37))
                                term.c.attr.fg = attr[i] - 30;
                        else if(BETWEEN(attr[i], 40, 47))
                                term.c.attr.bg = attr[i] - 40;
                        break;
                default:
                        if(BETWEEN(attr[i], 30, 37))
                                term.c.attr.fg = attr[i] - 30;
                        else if(BETWEEN(attr[i], 40, 47))
                                term.c.attr.bg = attr[i] - 40;
+                       else if(BETWEEN(attr[i], 90, 97))
+                               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 unkown\n", attr[i]); 
+                               fprintf(stderr, "erresc: gfx attr %d unknown\n", attr[i]); 
                        break;
                }
        }
                        break;
                }
        }
@@ -729,7 +711,7 @@ csihandle(void) {
                        case 12: /* att610 -- Stop blinking cursor (IGNORED) */
                                break;
                        case 25:
                        case 12: /* att610 -- Stop blinking cursor (IGNORED) */
                                break;
                        case 25:
-                               term.hidec = 1;
+                               term.c.hide = CURSOR_HIDE;
                                break;
                        case 1048: /* XXX: no alt. screen to erase/save */
                        case 1049:
                                break;
                        case 1048: /* XXX: no alt. screen to erase/save */
                        case 1049:
@@ -778,7 +760,7 @@ csihandle(void) {
                        case 12: /* att610 -- Start blinking cursor (IGNORED) */
                                break;
                        case 25:
                        case 12: /* att610 -- Start blinking cursor (IGNORED) */
                                break;
                        case 25:
-                               term.hidec = 0;
+                               term.c.hide = CURSOR_DRAW;
                                break;
                        case 1048: 
                        case 1049: /* XXX: no alt. screen to erase/save */
                                break;
                        case 1048: 
                        case 1049: /* XXX: no alt. screen to erase/save */
@@ -837,12 +819,7 @@ csireset(void) {
 void
 tputtab(void) {
        int space = TAB - term.c.x % TAB;
 void
 tputtab(void) {
        int space = TAB - term.c.x % TAB;
-       
-       if(term.c.x + space >= term.col)
-               space--;
-       
-       for(; space > 0; space--)
-               tmovecursor(CURSOR_RIGHT);
+       tmoveto(term.c.x + space, term.c.y);
 }
 
 void
 }
 
 void
@@ -879,7 +856,7 @@ tputc(char c) {
                                printf("esc unhandled charset: ESC ( %c\n", c);
                        }
                        term.esc = 0;
                                printf("esc unhandled charset: ESC ( %c\n", c);
                        }
                        term.esc = 0;
-               } else {                
+               } else {
                        switch(c) {
                        case '[':
                                term.esc |= ESC_CSI;
                        switch(c) {
                        case '[':
                                term.esc |= ESC_CSI;
@@ -890,20 +867,11 @@ tputc(char c) {
                        case '(':
                                term.esc |= ESC_ALTCHARSET;
                                break;
                        case '(':
                                term.esc |= ESC_ALTCHARSET;
                                break;
-                       case 'A':
-                               tmoveto(term.c.x, term.c.y-1);
-                               term.esc = 0;
-                               break;
-                       case 'B':
-                               tmoveto(term.c.x, term.c.y+1);
-                               term.esc = 0;
-                               break;
-                       case 'C':
-                               tmoveto(term.c.x+1, term.c.y);
-                               term.esc = 0;
-                               break;
-                       case 'D': /* XXX: CUP (VT100) or IND (VT52) ... */
-                               tmoveto(term.c.x-1, term.c.y);
+                       case 'D': /* IND -- Linefeed */
+                               if(term.c.y == term.bot)
+                                       tscrollup(1);
+                               else
+                                       tmoveto(term.c.x, term.c.y+1);
                                term.esc = 0;
                                break;
                        case 'E': /* NEL -- Next line */
                                term.esc = 0;
                                break;
                        case 'E': /* NEL -- Next line */
@@ -948,7 +916,7 @@ tputc(char c) {
                        tputtab();
                        break;
                case '\b':
                        tputtab();
                        break;
                case '\b':
-                       tmovecursor(CURSOR_LEFT);
+                       tmoveto(term.c.x-1, term.c.y);
                        break;
                case '\r':
                        tmoveto(0, term.c.y);
                        break;
                case '\r':
                        tmoveto(0, term.c.y);
@@ -965,14 +933,17 @@ tputc(char c) {
                        break;
                default:
                        tsetchar(c);
                        break;
                default:
                        tsetchar(c);
-                       tmovecursor(CURSOR_RIGHT);
+                       if(term.c.x+1 < term.col) {
+                               tmoveto(term.c.x+1, term.c.y);
+                       } else if(IS_SET(MODE_WRAP))
+                               tnewline();
                        break;
                }
        }
 }
 
 void
                        break;
                }
        }
 }
 
 void
-tputs(char *s, int len) { 
+tputs(char *s, int len) {
        for(; len > 0; len--)
                tputc(*s++);
 }
        for(; len > 0; len--)
                tputc(*s++);
 }
@@ -980,23 +951,28 @@ tputs(char *s, int len) {
 void
 tresize(int col, int row) {
        int i;
 void
 tresize(int col, int row) {
        int i;
-       Line *line;
        int minrow = MIN(row, term.row);
        int mincol = MIN(col, term.col);
 
        if(col < 1 || row < 1)
                return;
        int minrow = MIN(row, term.row);
        int mincol = MIN(col, term.col);
 
        if(col < 1 || row < 1)
                return;
-       /* alloc */
-       line = calloc(row, sizeof(Line));
-       for(i = 0 ; i < row; i++)
-               line[i] = calloc(col, sizeof(Glyph));
-       /* copy */
-       for(i = 0 ; i < minrow; i++)
-               memcpy(line[i], term.line[i], mincol * sizeof(Glyph));
-       /* free */
-       for(i = 0; i < term.row; i++)
+
+       /* free uneeded rows */
+       for(i = row; i < term.row; i++)
                free(term.line[i]);
                free(term.line[i]);
-       free(term.line);
+
+       /* resize to new height */
+       term.line = realloc(term.line, row * sizeof(Line));
+
+       /* resize each row to new width, zero-pad if needed */
+       for(i = 0; i < minrow; i++) {
+               term.line[i] = realloc(term.line[i], col * sizeof(Glyph));
+               memset(term.line[i] + mincol, 0, (col - mincol) * sizeof(Glyph));
+       }
+
+       /* allocate any new rows */
+       for(/* i == minrow */; i < row; i++)
+               term.line[i] = calloc(col, sizeof(Glyph));
        
        LIMIT(term.c.x, 0, col-1);
        LIMIT(term.c.y, 0, row-1);
        
        LIMIT(term.c.x, 0, col-1);
        LIMIT(term.c.y, 0, row-1);
@@ -1004,53 +980,79 @@ tresize(int col, int row) {
        LIMIT(term.bot, 0, row-1);
        
        term.bot = row-1;
        LIMIT(term.bot, 0, row-1);
        
        term.bot = row-1;
-       term.line = line;
        term.col = col, term.row = row;
 }
 
        term.col = col, term.row = row;
 }
 
-unsigned long
-xgetcol(const char *s) {
+void
+xloadcols(void) {
+       int i, r, g, b;
        XColor color;
        Colormap cmap = DefaultColormap(xw.dis, xw.scr);
        XColor color;
        Colormap cmap = DefaultColormap(xw.dis, xw.scr);
+       unsigned long white = WhitePixel(xw.dis, xw.scr);
+
+       for(i = 0; i < 16; i++) {
+               if (!XAllocNamedColor(xw.dis, 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.dis, cmap, s, &color, &color)) {
-               color.pixel = WhitePixel(xw.dis, xw.scr);
-               fprintf(stderr, "Could not allocate color '%s'\n", s);
+       /* same colors as xterm */
+       for(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;
+                               color.green = g == 0 ? 0 : 0x3737 + 0x2828 * g;
+                               color.blue = b == 0 ? 0 : 0x3737 + 0x2828 * b;
+                               if (!XAllocColor(xw.dis, cmap, &color)) {
+                                       dc.col[i] = white;
+                                       fprintf(stderr, "Could not allocate color %d\n", i);
+                               } else
+                                       dc.col[i] = color.pixel;
+                               i++;
+                       }
+
+       for(r = 0; r < 24; r++, i++) {
+               color.red = color.green = color.blue = 0x0808 + 0x0a0a * r;
+               if (!XAllocColor(xw.dis, cmap, &color)) {
+                       dc.col[i] = white;
+                       fprintf(stderr, "Could not allocate color %d\n", i);
+               } else
+                       dc.col[i] = color.pixel;
        }
        }
-       return color.pixel;
 }
 
 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,
 }
 
 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,
-                                  x1 * xw.cw, y1 * xw.ch, 
-                                  (x2-x1+1) * xw.cw, (y2-y1+1) * xw.ch);
+                      x1 * xw.cw, y1 * xw.ch,
+                      (x2-x1+1) * xw.cw, (y2-y1+1) * xw.ch);
 }
 
 void
 xhints(void)
 {
 }
 
 void
 xhints(void)
 {
-       XClassHint chint = {TNAME, TNAME};
-       XWMHints wmhint  = {.flags = InputHint, .input = 1};
-       XSizeHints shint = { 
-               .flags = PSize | PResizeInc,
-               .height = xw.h, /* XXX: doesn't seem to work, see run() */
+       XClassHint class = {TNAME, TNAME};
+       XWMHints wm = {.flags = InputHint, .input = 1};
+       XSizeHints size = {
+               .flags = PSize | PResizeInc | PBaseSize,
+               .height = xw.h,
                .width = xw.w,
                .height_inc = xw.ch,
                .width_inc = xw.cw,
                .width = xw.w,
                .height_inc = xw.ch,
                .width_inc = xw.cw,
+               .base_height = 2*BORDER,
+               .base_width = 2*BORDER,
        };
        };
-       XSetWMProperties(xw.dis, xw.win, NULL, NULL, NULL, 0, &shint, &wmhint, &chint);
+       XSetWMProperties(xw.dis, xw.win, NULL, NULL, NULL, 0, &size, &wm, &class);
 }
 
 void
 xinit(void) {
 }
 
 void
 xinit(void) {
-       int i;
-
-       xw.dis = XOpenDisplay(NULL);
-       xw.scr = XDefaultScreen(xw.dis);
-       if(!xw.dis)
+       if(!(xw.dis = XOpenDisplay(NULL)))
                die("Can't open display\n");
                die("Can't open display\n");
+       xw.scr = XDefaultScreen(xw.dis);
        
        /* font */
        if(!(dc.font = XLoadQueryFont(xw.dis, FONT)) || !(dc.bfont = XLoadQueryFont(xw.dis, BOLDFONT)))
        
        /* font */
        if(!(dc.font = XLoadQueryFont(xw.dis, FONT)) || !(dc.bfont = XLoadQueryFont(xw.dis, BOLDFONT)))
@@ -1061,8 +1063,7 @@ xinit(void) {
        xw.ch = dc.font->ascent + dc.font->descent;
 
        /* colors */
        xw.ch = dc.font->ascent + dc.font->descent;
 
        /* colors */
-       for(i = 0; i < LEN(colorname); i++)
-               dc.col[i] = xgetcol(colorname[i]);
+       xloadcols();
 
        term.c.attr.fg = DefaultFG;
        term.c.attr.bg = DefaultBG;
 
        term.c.attr.fg = DefaultFG;
        term.c.attr.bg = DefaultBG;
@@ -1071,7 +1072,7 @@ xinit(void) {
        xw.h = term.row * xw.ch + 2*BORDER;
        xw.w = term.col * xw.cw + 2*BORDER;
        xw.win = XCreateSimpleWindow(xw.dis, XRootWindow(xw.dis, xw.scr), 0, 0,
        xw.h = term.row * xw.ch + 2*BORDER;
        xw.w = term.col * xw.cw + 2*BORDER;
        xw.win = XCreateSimpleWindow(xw.dis, XRootWindow(xw.dis, xw.scr), 0, 0,
-                       xw.w, xw.h, 0, 
+                       xw.w, xw.h, 0,
                        dc.col[DefaultBG],
                        dc.col[DefaultBG]);
        xw.bufw = xw.w - 2*BORDER;
                        dc.col[DefaultBG],
                        dc.col[DefaultBG]);
        xw.bufw = xw.w - 2*BORDER;
@@ -1081,7 +1082,7 @@ xinit(void) {
        dc.gc = XCreateGC(xw.dis, xw.win, 0, NULL);
        XMapWindow(xw.dis, xw.win);
        xhints();
        dc.gc = XCreateGC(xw.dis, xw.win, 0, NULL);
        XMapWindow(xw.dis, xw.win);
        xhints();
-       XStoreName(xw.dis, xw.win, TNAME);
+       XStoreName(xw.dis, xw.win, "st");
        XSync(xw.dis, 0);
 }
 
        XSync(xw.dis, 0);
 }
 
@@ -1101,9 +1102,9 @@ xdraws(char *s, Glyph base, int x, int y, int len) {
        
        if(base.mode & ATTR_GFX)
                for(i = 0; i < len; i++)
        
        if(base.mode & ATTR_GFX)
                for(i = 0; i < len; i++)
-                       s[i] = gfx[s[i]];
+                       s[i] = gfx[(int)s[i]];
 
 
-       XSetFont(xw.dis, dc.gc, base.mode & ATTR_BOLD ? dc.bfont->fid : dc.font->fid);  
+       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)
        XDrawImageString(xw.dis, xw.buf, dc.gc, winx, winy, s, len);
        
        if(base.mode & ATTR_UNDERLINE)
@@ -1121,7 +1122,7 @@ 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)
                xdraws(&term.line[oldy][oldx].c, term.line[oldy][oldx], oldx, oldy, 1);
        /* remove the old cursor */
        if(term.line[oldy][oldx].state & GLYPH_SET)
                xdraws(&term.line[oldy][oldx].c, term.line[oldy][oldx], oldx, oldy, 1);
@@ -1135,7 +1136,6 @@ xcursor(int mode) {
        }
 }
 
        }
 }
 
-
 #ifdef DEBUG
 /* basic drawing routines */
 void
 #ifdef DEBUG
 /* basic drawing routines */
 void
@@ -1148,7 +1148,7 @@ xdrawc(int x, int y, Glyph g) {
 }
 
 void
 }
 
 void
-draw_(int dummy) {
+draw(int dummy) {
        int x, y;
 
        xclear(0, 0, term.col-1, term.row-1);
        int x, y;
 
        xclear(0, 0, term.col-1, term.row-1);
@@ -1157,41 +1157,49 @@ draw_(int dummy) {
                        if(term.line[y][x].state & GLYPH_SET)
                                xdrawc(x, y, term.line[y][x]);
 
                        if(term.line[y][x].state & GLYPH_SET)
                                xdrawc(x, y, term.line[y][x]);
 
-       if(!term.hidec)
-               xcursor(CURSOR_DRAW);
+       xcursor(term.c.hide);
        XCopyArea(xw.dis, xw.buf, xw.win, dc.gc, 0, 0, xw.bufw, xw.bufh, BORDER, BORDER);
        XFlush(xw.dis);
 }
        XCopyArea(xw.dis, xw.buf, xw.win, dc.gc, 0, 0, xw.bufw, xw.bufh, BORDER, BORDER);
        XFlush(xw.dis);
 }
-#endif
 
 
+#else
+/* optimized drawing routine */
 void
 draw(int redraw_all) {
        int i, x, y, ox;
        Glyph base, new;
        char buf[DRAW_BUF_SIZ];
        
 void
 draw(int redraw_all) {
        int i, x, y, ox;
        Glyph base, new;
        char buf[DRAW_BUF_SIZ];
        
+       XSetForeground(xw.dis, dc.gc, dc.col[DefaultBG]);
+       XFillRectangle(xw.dis, xw.buf, dc.gc, 0, 0, xw.bufw, xw.bufh);
        for(y = 0; y < term.row; y++) {
                base = term.line[y][0];
                i = ox = 0;
                for(x = 0; x < term.col; x++) {
                        new = term.line[y][x];
        for(y = 0; y < term.row; y++) {
                base = term.line[y][0];
                i = ox = 0;
                for(x = 0; x < term.col; x++) {
                        new = term.line[y][x];
-                       if(!ATTRCMP(base, new) && i < DRAW_BUF_SIZ)
-                               buf[i++] = new.c;
-                       else {
+                       if(i > 0 && (!(new.state & GLYPH_SET) || ATTRCMP(base, new) ||
+                                               i >= DRAW_BUF_SIZ)) {
                                xdraws(buf, base, ox, y, i);
                                xdraws(buf, base, ox, y, i);
-                               buf[0] = new.c;
-                               i = 1;
-                               ox = x;
-                               base = new;
+                               i = 0;
+                       }
+                       if(new.state & GLYPH_SET) {
+                               if(i == 0) {
+                                       ox = x;
+                                       base = new;
+                               }
+                               buf[i++] = new.c;
                        }
                }
                        }
                }
-               xdraws(buf, base, ox, y, i);
+               if(i > 0)
+                       xdraws(buf, base, ox, y, i);
        }
        }
-       xcursor(term.hidec ? CURSOR_HIDE : CURSOR_DRAW);
+       xcursor(term.c.hide);
        XCopyArea(xw.dis, xw.buf, xw.win, dc.gc, 0, 0, xw.bufw, xw.bufh, BORDER, BORDER);
        XFlush(xw.dis);
 }
 
        XCopyArea(xw.dis, xw.buf, xw.win, dc.gc, 0, 0, xw.bufw, xw.bufh, BORDER, BORDER);
        XFlush(xw.dis);
 }
 
+#endif
+
 void
 expose(XEvent *ev) {
        draw(SCREEN_REDRAW);
 void
 expose(XEvent *ev) {
        draw(SCREEN_REDRAW);
@@ -1220,7 +1228,7 @@ kpress(XEvent *ev) {
        shift = e->state & ShiftMask;
        len = XLookupString(e, buf, sizeof(buf), &ksym, NULL);
 
        shift = e->state & ShiftMask;
        len = XLookupString(e, buf, sizeof(buf), &ksym, NULL);
 
-       if(customkey = kmap(ksym))
+       if((customkey = kmap(ksym)))
                ttywrite(customkey, strlen(customkey));
        else if(len > 0) {
                buf[sizeof(buf)-1] = '\0';
                ttywrite(customkey, strlen(customkey));
        else if(len > 0) {
                buf[sizeof(buf)-1] = '\0';
@@ -1233,7 +1241,7 @@ 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", term.mode & MODE_APPKEYPAD ? 'O' : '[', "DACB"[ksym - XK_Left]);
+                       sprintf(buf, "\033%c%c", IS_SET(MODE_APPKEYPAD) ? 'O' : '[', "DACB"[ksym - XK_Left]);
                        ttywrite(buf, 3);
                        break;
                case XK_Insert:
                        ttywrite(buf, 3);
                        break;
                case XK_Insert:
@@ -1280,7 +1288,7 @@ run(void) {
                FD_ZERO(&rfd);
                FD_SET(cmdfd, &rfd);
                FD_SET(xfd, &rfd);
                FD_ZERO(&rfd);
                FD_SET(cmdfd, &rfd);
                FD_SET(xfd, &rfd);
-               if(select(MAX(xfd, cmdfd)+1, &rfd, NULL, NULL, NULL) == -1) {
+               if(select(MAX(xfd, cmdfd)+1, &rfd, NULL, NULL, NULL) < 0) {
                        if(errno == EINTR)
                                continue;
                        die("select failed: %s\n", SERRNO);
                        if(errno == EINTR)
                                continue;
                        die("select failed: %s\n", SERRNO);
@@ -1300,7 +1308,7 @@ run(void) {
 int
 main(int argc, char *argv[]) {
        if(argc == 2 && !strncmp("-v", argv[1], 3))
 int
 main(int argc, char *argv[]) {
        if(argc == 2 && !strncmp("-v", argv[1], 3))
-               die("st-" VERSION ", © 2009 st engineers\n");
+               die("st-" VERSION ", (c) 2010 st engineers\n");
        else if(argc != 1)
                die("usage: st [-v]\n");
        setlocale(LC_CTYPE, "");
        else if(argc != 1)
                die("usage: st [-v]\n");
        setlocale(LC_CTYPE, "");