From 45e3044ed47fcaab15579da516df8922b3b48954 Mon Sep 17 00:00:00 2001 From: Jeremie Koenig Date: Sun, 1 Aug 2010 13:52:04 +0200 Subject: Add wide character support to the Hurd console * hurd/console.h (CONS_WCHAR_MASK, CONS_WCHAR_CONTINUED): New macros. * console/console.c: Include (main): Call setlocale. * console/display.c (display_output_one): Call wcwidth() to know the width of the character to be displayed. Iterate over this with to insert characters with the additional CONS_WCHAR_CONTINUED flag. Update screen_shift_right and display_record_filechange calls accordingly. * console-client/vga-dynafont.c (WCHAR_BOLD, WCHAR_ITALIC, WCHAR_MASK): Change macro values. (dynafont_new): Use glyph->bbox.{width,height} instead of df->font->bbox.{width,height}. (dynafont_change_font): Likewise. (dynafont_lookup_internal): Likewise. Mask out CONS_WCHAR_CONTINUED before calling bdf_find_glyph, but test it for the second position of a double-width glyph. (dynafont_activate): Enable 9-bit width only when font width is not dividable by 8. --- console-client/vga-dynafont.c | 54 ++++++++++++++++++++++--------------------- 1 file changed, 28 insertions(+), 26 deletions(-) (limited to 'console-client') diff --git a/console-client/vga-dynafont.c b/console-client/vga-dynafont.c index 0cce5176..3888af79 100644 --- a/console-client/vga-dynafont.c +++ b/console-client/vga-dynafont.c @@ -60,9 +60,9 @@ struct mapped_character /* Remember the character this glyph belongs to, so the glyph can be reloaded when the font is changed. This is actually a wchar_t with some text attributes mixed into the high bits. */ -#define WCHAR_BOLD ((wchar_t) 0x40000000) -#define WCHAR_ITALIC ((wchar_t) 0x20000000) -#define WCHAR_MASK ((wchar_t) 0x001fffff) +#define WCHAR_BOLD ((wchar_t) 0x20000000) +#define WCHAR_ITALIC ((wchar_t) 0x10000000) +#define WCHAR_MASK CONS_WCHAR_MASK wchar_t character; /* Used by libihash for fast removal of elements. */ @@ -541,14 +541,13 @@ dynafont_new (bdf_font_t font, bdf_font_t font_italic, bdf_font_t font_bold, glyph = bdf_find_glyph (df->font, -1, UNICODE_REPLACEMENT_CHARACTER); if (glyph) { - /* XXX Take glyph size into account. */ - for (int i = 0; i < ((df->font->bbox.height > 32) - ? 32 : df->font->bbox.height); i++) + for (int i = 0; i < ((glyph->bbox.height > 32) + ? 32 : glyph->bbox.height); i++) df->vga_font[FONT_INDEX_UNKNOWN][i] - = glyph->bitmap[i * ((df->font->bbox.width + 7) / 8)]; - if (df->font->bbox.height < 32) + = glyph->bitmap[i * ((glyph->bbox.width + 7) / 8)]; + if (glyph->bbox.height < 32) memset (((char *) df->vga_font[FONT_INDEX_UNKNOWN]) - + df->font->bbox.height, 0, 32 - df->font->bbox.height); + + glyph->bbox.height, 0, 32 - glyph->bbox.height); /* Update the hash table. */ hurd_ihash_add (&df->charmap, UNICODE_REPLACEMENT_CHARACTER, chr); @@ -780,9 +779,9 @@ dynafont_lookup_internal (dynafont_t df, bdf_font_t font, || (!lgc && !df->vga_font_free_indices)) return 0; - glyph = bdf_find_glyph (font, (int) wide_chr, 0); + glyph = bdf_find_glyph (font, (int) (wide_chr & ~CONS_WCHAR_CONTINUED), 0); if (!glyph) - glyph = bdf_find_glyph (font, -1, (int) wide_chr); + glyph = bdf_find_glyph (font, -1, (int) (wide_chr & ~CONS_WCHAR_CONTINUED)); if (!glyph) return 0; @@ -847,14 +846,17 @@ dynafont_lookup_internal (dynafont_t df, bdf_font_t font, chr->refs = 1; chr->character = (wide_chr | attr); - /* XXX Should look at glyph bbox. */ - for (int i = 0; i < ((font->bbox.height > 32) - ? 32 : font->bbox.height); i++) - df->vga_font[pos][i] - = glyph->bitmap[i * ((font->bbox.width + 7) / 8)]; - if (font->bbox.height < 32) - memset (((char *) df->vga_font[pos]) - + font->bbox.height, 0, 32 - font->bbox.height); + /* Copy the glyph bitmap, taking into account double-width charcters. */ + { + int height = (glyph->bbox.height > 32) ? 32 : glyph->bbox.height; + int bwidth = (glyph->bbox.width + 7) / 8; + int ofs = (bwidth >= 2) && (wide_chr & CONS_WCHAR_CONTINUED); + + for (int i = 0; i < height; i++) + df->vga_font[pos][i] = glyph->bitmap[i * bwidth + ofs]; + if (height < 32) + memset (&df->vga_font[pos][height], 0, 32 - height); + } if (active_dynafont == df) vga_write_font_buffer (0, pos, df->vga_font[pos], @@ -958,7 +960,7 @@ dynafont_activate (dynafont_t df) display problems for the user if we don't also program the video mode timings. The standard font height for 80x25 is 16. */ vga_set_font_height (height); - vga_set_font_width (df->font->bbox.width <= 8 ? 8 : 9); + vga_set_font_width (df->font->bbox.width % 8 ? 9 : 8); active_dynafont = df; dynafont_set_cursor (df, df->cursor_standout); @@ -1027,13 +1029,13 @@ dynafont_change_font (dynafont_t df, bdf_font_t font) else { /* XXX Take font size and glyph size into account. */ - for (int j = 0; j < ((df->font->bbox.height > 32) - ? 32 : df->font->bbox.height); j++) + for (int j = 0; j < ((glyph->bbox.height > 32) + ? 32 : glyph->bbox.height); j++) df->vga_font[i][j] - = glyph->bitmap[j * ((df->font->bbox.width + 7) / 8)]; - if (df->font->bbox.height < 32) - memset (((char *) df->vga_font[i]) + df->font->bbox.height, - 0, 32 - df->font->bbox.height); + = glyph->bitmap[j * ((glyph->bbox.width + 7) / 8)]; + if (glyph->bbox.height < 32) + memset (((char *) df->vga_font[i]) + glyph->bbox.height, + 0, 32 - glyph->bbox.height); } } } -- cgit v1.2.3