Rename 'VGA' character set to CP-437

diff --git a/include/grub/term.h b/include/grub/term.h
index e460e4a58bc26ffb858adfb1562e8d385effbf76..c744c3fb6589688cbabfa17c34567ff81e2cc178 100644 (file)
--- 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 4d7dbf622de90c53625619c9a0e9a8bd8e54e88f..2689f18b66a31b3c79a0b9228574dd5d4f7eaf62 100644 (file)
--- 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 2a7e34ad40ce0f104438a5fe7f371fc8c7492107..19a8e3814ea7c9a9785842f7bb00dca152fa3729 100644 (file)
--- 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 60bde5b053daef20508121177f42507ff64daab8..9fca56c29cc4b9706d539006c5e449e26e4f11fd 100644 (file)
--- 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 dcf17106ac030fa734d995a1273eddc3808df7d2..ff54e5dba38e5a5061fb352db8c3660ba6c3348f 100644 (file)
--- 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]