From 223909e008bae6fce33cc1ad72e8480fc36805ca Mon Sep 17 00:00:00 2001
From: =?utf8?q?Aur=C3=A9lien=20Aptel?= <aurelien.aptel@gmail.com>
Date: Thu, 2 Sep 2010 20:21:40 +0200
Subject: [PATCH] undefined gfx doesn't draw \0.
---
st.c | 12 +++++++++---
1 file 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) {
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);
--
2.20.1