vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Visual(sic) UTF-8 support

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-03-16 10:39:18 +01:00
parent 4f501d31ae
commit 05c15154a2
3 changed files with 37 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/grub/term.h
View file

@ -80,6 +80,7 @@ grub_term_color_state;
#define GRUB_TERM_CODE_TYPE_UTF8_LOGICAL (1 << 4) #define GRUB_TERM_CODE_TYPE_UTF8_LOGICAL (1 << 4)
/* UCS-4 in visual order. */ /* UCS-4 in visual order. */
#define GRUB_TERM_CODE_TYPE_UCS4_VISUAL ((1 << 4) | (1 << 3)) #define GRUB_TERM_CODE_TYPE_UCS4_VISUAL ((1 << 4) | (1 << 3))
#define GRUB_TERM_CODE_TYPE_UTF8_VISUAL ((1 << 5) | (1 << 4))
/* Bitmasks for modifier keys returned by grub_getkeystatus. */ /* Bitmasks for modifier keys returned by grub_getkeystatus. */

43
normal/charset.c
View file

@ -1053,7 +1053,9 @@ grub_putcode (grub_uint32_t code, struct grub_term_output *term)
} }
if ((term->flags & GRUB_TERM_CODE_TYPE_MASK) if ((term->flags & GRUB_TERM_CODE_TYPE_MASK)
== GRUB_TERM_CODE_TYPE_UTF8_LOGICAL) == GRUB_TERM_CODE_TYPE_UTF8_LOGICAL
|| (term->flags & GRUB_TERM_CODE_TYPE_MASK)
== GRUB_TERM_CODE_TYPE_UTF8_VISUAL)
{ {
grub_uint8_t str[20], *ptr; grub_uint8_t str[20], *ptr;
@ -1081,8 +1083,10 @@ grub_print_ucs4 (const grub_uint32_t * str,
const grub_uint32_t * last_position, const grub_uint32_t * last_position,
struct grub_term_output *term) struct grub_term_output *term)
{ {
if ((term->flags & GRUB_TERM_CODE_TYPE_MASK) if ((term->flags & GRUB_TERM_CODE_TYPE_MASK)
== GRUB_TERM_CODE_TYPE_UCS4_VISUAL) == GRUB_TERM_CODE_TYPE_UCS4_VISUAL
|| (term->flags & GRUB_TERM_CODE_TYPE_MASK)
== GRUB_TERM_CODE_TYPE_UTF8_VISUAL)
{ {
grub_ssize_t visual_len; grub_ssize_t visual_len;
struct grub_unicode_glyph *visual; struct grub_unicode_glyph *visual;
@ -1099,23 +1103,46 @@ grub_print_ucs4 (const grub_uint32_t * str,
} }
for (visual_ptr = visual; visual_ptr < visual + visual_len; visual_ptr++) for (visual_ptr = visual; visual_ptr < visual + visual_len; visual_ptr++)
{ {
struct grub_unicode_glyph glyph_r = { struct grub_unicode_glyph c = {
.base = '\r',
.variant = 0, .variant = 0,
.attributes = 0, .attributes = 0,
.ncomb = 0, .ncomb = 0,
.combining = 0 .combining = 0
}; };
term->putchar (visual_ptr); if ((term->flags & GRUB_TERM_CODE_TYPE_MASK)
== GRUB_TERM_CODE_TYPE_UTF8_VISUAL)
{
int i;
for (i = -1; i < (int) visual_ptr->ncomb; i++)
{
grub_uint8_t u8[20], *ptr;
if (i == -1)
grub_ucs4_to_utf8 (&visual_ptr->base, 1, u8, sizeof (u8));
else
grub_ucs4_to_utf8 (&visual_ptr->combining[i].code,
1, u8, sizeof (u8));
for (ptr = u8; *ptr; ptr++)
{
c.base = *ptr;
(term->putchar) (&c);
}
}
}
else
term->putchar (visual_ptr);
if (visual_ptr->base == '\n') if (visual_ptr->base == '\n')
term->putchar (&glyph_r); {
c.base = '\r';
term->putchar (&c);
}
grub_free (visual_ptr->combining); grub_free (visual_ptr->combining);
} }
grub_free (visual); grub_free (visual);
return; return;
} }
/* FIXME: UTF-8 terminals. */
{ {
const grub_uint32_t *ptr; const grub_uint32_t *ptr;
for (ptr = str; ptr < last_position; ptr++) for (ptr = str; ptr < last_position; ptr++)

2
term/serial.c
View file

@ -453,7 +453,7 @@ static struct grub_term_output grub_serial_term_output =
.cls = grub_serial_cls, .cls = grub_serial_cls,
.setcolorstate = grub_serial_setcolorstate, .setcolorstate = grub_serial_setcolorstate,
.setcursor = grub_serial_setcursor, .setcursor = grub_serial_setcursor,
.flags = GRUB_TERM_CODE_TYPE_UTF8_LOGICAL, .flags = GRUB_TERM_CODE_TYPE_UTF8_VISUAL,
}; };