major internal changes in representation of character cells.

we now use 12 bytes per cell instead of 10. however, this allows us to
support 256-color mode (not yet implemented but the framework is in
place) and to mix scripts when using combining characters. while the
latter sounds ridiculous at first, being able to visibly see a
combining letter attached to a [, ", or ' is extremely useful in
scripting and regular expressions with some languages.

some code is left slightly messy, but overall it's much cleaner now
since struct uucell is now properly encapsulated.

1 files changed, 2 insertions, 2 deletions

diff --git a/dblbuf.c b/dblbuf.c
index 32ff996..18e2cd5 100644
--- a/dblbuf.c
+++ b/dblbuf.c
@@ -117,8 +117,8 @@ void uudisp_predraw_cell(struct uudisp *d, int idx, int x, int color)
 {
 	struct dblbuf *b = (void *)&d->priv;
 
-	b->slices[idx].colors[2*x] = expand_color(d, color&15);
-	b->slices[idx].colors[2*x+1] = expand_color(d, color>>4) ^ b->slices[idx].colors[2*x];
+	b->slices[idx].colors[2*x] = expand_color(d, color&255);
+	b->slices[idx].colors[2*x+1] = expand_color(d, color>>8) ^ b->slices[idx].colors[2*x];
 }
 
 void uudisp_draw_glyph(struct uudisp *d, int idx, int x, const void *glyph)