From bf17ef45d66d1e14770832c6271bbd60f66e86de Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 16 Mar 2010 19:23:21 +0100
Subject: [PATCH] Rename UCS4 to glyph description

---
 include/grub/term.h | 7 ++++---
 normal/charset.c    | 2 +-
 term/gfxterm.c      | 2 +-
 term/i386/pc/vga.c  | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/include/grub/term.h b/include/grub/term.h
index d715755cc..573f20331 100644
--- a/include/grub/term.h
+++ b/include/grub/term.h
@@ -78,9 +78,10 @@ grub_term_color_state;
 /* 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	(1 << 4)
-/* UCS-4 in visual order.  */
-#define GRUB_TERM_CODE_TYPE_UCS4_VISUAL	        ((1 << 4) | (1 << 3))
-#define GRUB_TERM_CODE_TYPE_UTF8_VISUAL	        ((1 << 5) | (1 << 4))
+/* UTF-8 in visual order. Like UTF-8 logical but for buggy endpoints.  */
+#define GRUB_TERM_CODE_TYPE_UTF8_VISUAL	        ((1 << 4) | (1 << 3))
+/* Glyph description in visual order.  */
+#define GRUB_TERM_CODE_TYPE_VISUAL_GLYPHS       (1 << 5)
 
 
 /* Bitmasks for modifier keys returned by grub_getkeystatus.  */
diff --git a/normal/charset.c b/normal/charset.c
index 24413ee76..53b9578e5 100644
--- a/normal/charset.c
+++ b/normal/charset.c
@@ -1179,7 +1179,7 @@ grub_print_ucs4 (const grub_uint32_t * str,
   startwidth = ((term->getxy () >> 8) & 0xff) - margin_left;
 
   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) 
       == GRUB_TERM_CODE_TYPE_UTF8_VISUAL)
     {
diff --git a/term/gfxterm.c b/term/gfxterm.c
index 797e714d2..7e35148d4 100644
--- a/term/gfxterm.c
+++ b/term/gfxterm.c
@@ -1206,7 +1206,7 @@ static struct grub_term_output grub_video_term =
     .getcolor = grub_virtual_screen_getcolor,
     .setcursor = grub_gfxterm_setcursor,
     .refresh = grub_gfxterm_refresh,
-    .flags = GRUB_TERM_CODE_TYPE_UCS4_VISUAL,
+    .flags = GRUB_TERM_CODE_TYPE_VISUAL_GLYPHS,
     .next = 0
   };
 
diff --git a/term/i386/pc/vga.c b/term/i386/pc/vga.c
index 448a773ef..036ac592a 100644
--- a/term/i386/pc/vga.c
+++ b/term/i386/pc/vga.c
@@ -505,7 +505,7 @@ static struct grub_term_output grub_vga_term =
     .cls = grub_vga_cls,
     .setcolorstate = grub_vga_setcolorstate,
     .setcursor = grub_vga_setcursor,
-    .flags = GRUB_TERM_CODE_TYPE_UCS4_VISUAL,
+    .flags = GRUB_TERM_CODE_TYPE_VISUAL_GLYPHS,
   };
 
 GRUB_MOD_INIT(vga)