diff --git a/include/grub/term.h b/include/grub/term.h index e460e4a58..c744c3fb6 100644 --- a/include/grub/term.h +++ b/include/grub/term.h @@ -74,8 +74,8 @@ grub_term_color_state; #define GRUB_TERM_CODE_TYPE_MASK (7 << GRUB_TERM_CODE_TYPE_SHIFT) /* Only ASCII characters accepted. */ #define GRUB_TERM_CODE_TYPE_ASCII (0 << GRUB_TERM_CODE_TYPE_SHIFT) -/* Expects VGA characters (ASCII + pseudographics). */ -#define GRUB_TERM_CODE_TYPE_VGA (1 << GRUB_TERM_CODE_TYPE_SHIFT) +/* Expects CP-437 characters (ASCII + pseudographics). */ +#define GRUB_TERM_CODE_TYPE_CP437 (1 << GRUB_TERM_CODE_TYPE_SHIFT) /* UTF-8 stream in logical order. Usually used for terminals which just forward the stream to another computer. */ #define GRUB_TERM_CODE_TYPE_UTF8_LOGICAL (2 << GRUB_TERM_CODE_TYPE_SHIFT) diff --git a/normal/term.c b/normal/term.c index 4d7dbf622..2689f18b6 100644 --- a/normal/term.c +++ b/normal/term.c @@ -125,7 +125,7 @@ map_code (grub_uint32_t in, struct grub_term_output *term) switch (term->flags & GRUB_TERM_CODE_TYPE_MASK) { - case GRUB_TERM_CODE_TYPE_VGA: + case GRUB_TERM_CODE_TYPE_CP437: switch (in) { case GRUB_UNICODE_LEFTARROW: diff --git a/term/i386/pc/console.c b/term/i386/pc/console.c index 2a7e34ad4..19a8e3814 100644 --- a/term/i386/pc/console.c +++ b/term/i386/pc/console.c @@ -63,7 +63,7 @@ static struct grub_term_output grub_console_term_output = .cls = grub_console_cls, .setcolorstate = grub_console_setcolorstate, .setcursor = grub_console_setcursor, - .flags = GRUB_TERM_CODE_TYPE_VGA, + .flags = GRUB_TERM_CODE_TYPE_CP437, .normal_color = GRUB_TERM_DEFAULT_NORMAL_COLOR, .highlight_color = GRUB_TERM_DEFAULT_HIGHLIGHT_COLOR, }; diff --git a/term/i386/pc/vga_text.c b/term/i386/pc/vga_text.c index 60bde5b05..9fca56c29 100644 --- a/term/i386/pc/vga_text.c +++ b/term/i386/pc/vga_text.c @@ -164,7 +164,7 @@ static struct grub_term_output grub_vga_text_term = .cls = grub_vga_text_cls, .setcolorstate = grub_console_setcolorstate, .setcursor = grub_vga_text_setcursor, - .flags = GRUB_TERM_CODE_TYPE_VGA, + .flags = GRUB_TERM_CODE_TYPE_CP437, .normal_color = GRUB_TERM_DEFAULT_NORMAL_COLOR, .highlight_color = GRUB_TERM_DEFAULT_HIGHLIGHT_COLOR, }; diff --git a/term/terminfo.c b/term/terminfo.c index dcf17106a..ff54e5dba 100644 --- a/term/terminfo.c +++ b/term/terminfo.c @@ -521,7 +521,7 @@ print_terminfo (void) they are not used on terminfo terminals. */ [GRUB_TERM_CODE_TYPE_ASCII >> GRUB_TERM_CODE_TYPE_SHIFT] = _("ASCII"), - [GRUB_TERM_CODE_TYPE_VGA >> GRUB_TERM_CODE_TYPE_SHIFT] = "VGA", + [GRUB_TERM_CODE_TYPE_CP437 >> GRUB_TERM_CODE_TYPE_SHIFT] = "CP-437", [GRUB_TERM_CODE_TYPE_UTF8_LOGICAL >> GRUB_TERM_CODE_TYPE_SHIFT] = _("UTF-8"), [GRUB_TERM_CODE_TYPE_UTF8_VISUAL >> GRUB_TERM_CODE_TYPE_SHIFT]