added F1-12 key, fixed DCH and ICH.

[st.git] / st.c

diff --git a/st.c b/st.c
old mode 100755 (executable)
new mode 100644 (file)
index 6b525c3..6e34f1e
--- a/st.c
+++ b/st.c
@@ -20,8 +20,6 @@
 #include <X11/keysym.h>
 #include <X11/Xutil.h>
 
-#define TNAME "xterm"
-
 /* Arbitrary sizes */
 #define ESC_TITLE_SIZ 256
 #define ESC_BUF_SIZ   256
@@ -107,16 +105,16 @@ typedef struct {
        char s[ESC_BUF_SIZ];
 } Key;
 
-#include "config.h"
-
 /* Drawing Context */
 typedef struct {
-       unsigned long col[LEN(colorname)];
+       unsigned long col[256];
        XFontStruct* font;
        XFontStruct* bfont;
        GC gc;
 } DC;
 
+#include "config.h"
+
 static void die(const char *errstr, ...);
 static void draw(int);
 static void execsh(void);
@@ -154,10 +152,10 @@ static void ttyread(void);
 static void ttyresize(int, int);
 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 void xinit(void);
+static void xloadcols(void);
 
 static void expose(XEvent *);
 static char* kmap(KeySym);
@@ -499,21 +497,21 @@ tdeletechar(int n) {
                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;
-       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));
-       tclearregion(src, term.c.y, dst, term.c.y);
+       tclearregion(src, term.c.y, dst - 1, term.c.y);
 }
 
 void
@@ -593,9 +591,31 @@ tsetattr(int *attr, int l) {
                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 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:
                        term.c.attr.bg = DefaultBG;
                        break;
@@ -604,8 +624,12 @@ 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;
+                       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 
-                               fprintf(stderr, "erresc: gfx attr %d unkown\n", attr[i]); 
+                               fprintf(stderr, "erresc: gfx attr %d unknown\n", attr[i]); 
                        break;
                }
        }
@@ -1009,16 +1033,44 @@ tresize(int col, int 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);
+       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;
+       }
+
+       /* 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++;
+                       }
 
-       if(!XAllocNamedColor(xw.dis, cmap, s, &color, &color)) {
-               color.pixel = WhitePixel(xw.dis, xw.scr);
-               fprintf(stderr, "Could not allocate color '%s'\n", s);
+       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
@@ -1048,8 +1100,6 @@ xhints(void)
 
 void
 xinit(void) {
-       int i;
-
        xw.dis = XOpenDisplay(NULL);
        xw.scr = XDefaultScreen(xw.dis);
        if(!xw.dis)
@@ -1064,8 +1114,7 @@ xinit(void) {
        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;
@@ -1104,7 +1153,7 @@ 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]];
+                       s[i] = gfx[(int)s[i]];
 
        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);
@@ -1124,7 +1173,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;
-
+       
        /* 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);
@@ -1173,6 +1222,8 @@ draw(int redraw_all) {
        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.w, xw.h);
        for(y = 0; y < term.row; y++) {
                base = term.line[y][0];
                i = ox = 0;
@@ -1225,7 +1276,7 @@ kpress(XEvent *ev) {
        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';