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

Rename UCS4 to glyph description

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-03-16 19:23:21 +01:00
parent d6e0e85bf4
commit bf17ef45d6
4 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
include/grub/term.h
View file

@ -78,9 +78,10 @@ grub_term_color_state;
/* UTF-8 stream in logical order. Usually used for terminals /* UTF-8 stream in logical order. Usually used for terminals
which just forward the stream to another computer. */ which just forward the stream to another computer. */
#define GRUB_TERM_CODE_TYPE_UTF8_LOGICAL (1 << 4) #define GRUB_TERM_CODE_TYPE_UTF8_LOGICAL (1 << 4)
/* UCS-4 in visual order. */ /* UTF-8 in visual order. Like UTF-8 logical but for buggy endpoints. */
#define GRUB_TERM_CODE_TYPE_UCS4_VISUAL ((1 << 4) | (1 << 3)) #define GRUB_TERM_CODE_TYPE_UTF8_VISUAL ((1 << 4) | (1 << 3))
#define GRUB_TERM_CODE_TYPE_UTF8_VISUAL ((1 << 5) | (1 << 4)) /* Glyph description in visual order. */
#define GRUB_TERM_CODE_TYPE_VISUAL_GLYPHS (1 << 5)
/* Bitmasks for modifier keys returned by grub_getkeystatus. */ /* Bitmasks for modifier keys returned by grub_getkeystatus. */

2
normal/charset.c
View file

@ -1179,7 +1179,7 @@ grub_print_ucs4 (const grub_uint32_t * str,
startwidth = ((term->getxy () >> 8) & 0xff) - margin_left; startwidth = ((term->getxy () >> 8) & 0xff) - margin_left;
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_VISUAL_GLYPHS
|| (term->flags & GRUB_TERM_CODE_TYPE_MASK) || (term->flags & GRUB_TERM_CODE_TYPE_MASK)
== GRUB_TERM_CODE_TYPE_UTF8_VISUAL) == GRUB_TERM_CODE_TYPE_UTF8_VISUAL)
{ {

2
term/gfxterm.c
View file

@ -1206,7 +1206,7 @@ static struct grub_term_output grub_video_term =
.getcolor = grub_virtual_screen_getcolor, .getcolor = grub_virtual_screen_getcolor,
.setcursor = grub_gfxterm_setcursor, .setcursor = grub_gfxterm_setcursor,
.refresh = grub_gfxterm_refresh, .refresh = grub_gfxterm_refresh,
.flags = GRUB_TERM_CODE_TYPE_UCS4_VISUAL, .flags = GRUB_TERM_CODE_TYPE_VISUAL_GLYPHS,
.next = 0 .next = 0
}; };

2
term/i386/pc/vga.c
View file

@ -505,7 +505,7 @@ static struct grub_term_output grub_vga_term =
.cls = grub_vga_cls, .cls = grub_vga_cls,
.setcolorstate = grub_vga_setcolorstate, .setcolorstate = grub_vga_setcolorstate,
.setcursor = grub_vga_setcursor, .setcursor = grub_vga_setcursor,
.flags = GRUB_TERM_CODE_TYPE_UCS4_VISUAL, .flags = GRUB_TERM_CODE_TYPE_VISUAL_GLYPHS,
}; };
GRUB_MOD_INIT(vga) GRUB_MOD_INIT(vga)