JasonWoof Got questions, comments, patches, etc.? Contact Jason Woofenden
undefined gfx doesn't draw \0.
authorAurélien Aptel <aurelien.aptel@gmail.com>
Thu, 2 Sep 2010 18:21:40 +0000 (20:21 +0200)
committerAurélien Aptel <aurelien.aptel@gmail.com>
Thu, 2 Sep 2010 18:21:40 +0000 (20:21 +0200)
st.c

diff --git a/st.c b/st.c
index ed5481d..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;
                }
        }
@@ -1230,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);