set terminal colors to xterm default ones.

[st.git] / st.c

diff --git a/st.c b/st.c
index f7f9de8..9e66d09 100644 (file)
--- a/st.c
+++ b/st.c
@@ -677,7 +677,8 @@ tsetattr(int *attr, int l) {
                        else if(BETWEEN(attr[i], 100, 107))
                                term.c.attr.fg = attr[i] - 100 + 8;
                        else 
-                               fprintf(stderr, "erresc: gfx attr %d unknown\n", attr[i]); 
+                               fprintf(stderr, "erresc: gfx attr %d unknown\n", attr[i]), csidump();
+                       
                        break;
                }
        }
@@ -1060,12 +1061,25 @@ tresize(int col, int row) {
        int i;
        int minrow = MIN(row, term.row);
        int mincol = MIN(col, term.col);
+       int slide = term.c.y - row + 1;
 
        if(col < 1 || row < 1)
                return;
 
-       /* free uneeded rows */
-       for(i = row; i < term.row; i++) {
+       /* free unneeded rows */
+       i = 0;
+       if(slide > 0) {
+               /* slide screen to keep cursor where we expect it -
+                * tscrollup would work here, but we can optimize to
+                * memmove because we're freeing the earlier lines */
+               for(/* i = 0 */; i < slide; i++) {
+                       free(term.line[i]);
+                       free(term.alt[i]);
+               }
+               memmove(term.line, term.line + slide, row * sizeof(Line));
+               memmove(term.alt, term.alt + slide, row * sizeof(Line));
+       }
+       for(i += row; i < term.row; i++) {
                free(term.line[i]);
                free(term.alt[i]);
        }
@@ -1217,8 +1231,13 @@ xdraws(char *s, Glyph base, int x, int y, int len) {
        XSetForeground(xw.dis, dc.gc, xfg);
        
        if(base.mode & ATTR_GFX)
-               for(i = 0; i < len; i++)
-                       s[i] = gfx[(int)s[i]];
+               for(i = 0; i < len; i++) {
+                       char c = gfx[(unsigned int)s[i] % 256];
+                       if(c)
+                               s[i] = c;
+                       else if(s[i] > 0x5f)
+                               s[i] -= 0x5f;
+               }
 
        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);