Add wide character support to the Hurd console

* hurd/console.h (CONS_WCHAR_MASK, CONS_WCHAR_CONTINUED): New macros.
* console/console.c: Include <locale.h>
(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.

1 files changed, 7 insertions, 1 deletions

diff --git a/hurd/console.h b/hurd/console.h
index 065ed7d2..16bc068d 100644
--- a/hurd/console.h
+++ b/hurd/console.h
@@ -50,7 +50,13 @@ typedef struct
   uint32_t italic : 1;
   uint32_t bold : 1;
 } conchar_attr_t; 
-  
+
+/* We support double-width characters by using an extra bit to identify the
+   continuation in the character matrix.  The constants below document our
+   usage of wchar_t.  */
+#define CONS_WCHAR_MASK       ((wchar_t) 0x401fffff)
+#define CONS_WCHAR_CONTINUED  ((wchar_t) 0x40000000)
+
 typedef struct
 {
   wchar_t chr;