aboutsummaryrefslogtreecommitdiff
path: root/st.c
diff options
context:
space:
mode:
authorAurélien Aptel <aurelien.aptel@gmail.com>2010-09-02 20:21:40 +0200
committerAurélien Aptel <aurelien.aptel@gmail.com>2010-09-02 20:21:40 +0200
commit223909e008bae6fce33cc1ad72e8480fc36805ca (patch)
treef15b7f9dbeab3dd9fcec67306a6673656a86dfae /st.c
parentb6af0fdc20cd79861fbf770c71484ec04405e744 (diff)
downloadst-223909e008bae6fce33cc1ad72e8480fc36805ca.tar.gz
st-223909e008bae6fce33cc1ad72e8480fc36805ca.zip
undefined gfx doesn't draw \0.
Diffstat (limited to 'st.c')
-rw-r--r--st.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/st.c b/st.c
index ed5481d..9e66d09 100644
--- a/st.c
+++ b/st.c
@@ -677,7 +677,8 @@ tsetattr(int *attr, int l) {
677 else if(BETWEEN(attr[i], 100, 107)) 677 else if(BETWEEN(attr[i], 100, 107))
678 term.c.attr.fg = attr[i] - 100 + 8; 678 term.c.attr.fg = attr[i] - 100 + 8;
679 else 679 else
680 fprintf(stderr, "erresc: gfx attr %d unknown\n", attr[i]); 680 fprintf(stderr, "erresc: gfx attr %d unknown\n", attr[i]), csidump();
681
681 break; 682 break;
682 } 683 }
683 } 684 }
@@ -1230,8 +1231,13 @@ xdraws(char *s, Glyph base, int x, int y, int len) {
1230 XSetForeground(xw.dis, dc.gc, xfg); 1231 XSetForeground(xw.dis, dc.gc, xfg);
1231 1232
1232 if(base.mode & ATTR_GFX) 1233 if(base.mode & ATTR_GFX)
1233 for(i = 0; i < len; i++) 1234 for(i = 0; i < len; i++) {
1234 s[i] = gfx[(int)s[i]]; 1235 char c = gfx[(unsigned int)s[i] % 256];
1236 if(c)
1237 s[i] = c;
1238 else if(s[i] > 0x5f)
1239 s[i] -= 0x5f;
1240 }
1235 1241
1236 XSetFont(xw.dis, dc.gc, base.mode & ATTR_BOLD ? dc.bfont->fid : dc.font->fid); 1242 XSetFont(xw.dis, dc.gc, base.mode & ATTR_BOLD ? dc.bfont->fid : dc.font->fid);
1237 XDrawImageString(xw.dis, xw.buf, dc.gc, winx, winy, s, len); 1243 XDrawImageString(xw.dis, xw.buf, dc.gc, winx, winy, s, len);