2008-08-19 Robert Millan <rmh@aybabtu.com>

        * term/gfxterm.c (DEFAULT_CURSOR_COLOR): Remove.
        (struct grub_virtual_screen): Remove `cursor_color'.
        (grub_virtual_screen_setup): Remove `virtual_screen.cursor_color'
        initialization.
        (write_cursor): Use `virtual_screen.fg_color' to draw cursor.

diff --git a/ChangeLog b/ChangeLog
index 144a5311d0dc0e873541d5470905c4b417c3378a..9256549d68935ad245f9238c9be0589dfd87712d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-08-19  Robert Millan  <rmh@aybabtu.com>
+
+       * term/gfxterm.c (DEFAULT_CURSOR_COLOR): Remove.
+       (struct grub_virtual_screen): Remove `cursor_color'.
+       (grub_virtual_screen_setup): Remove `virtual_screen.cursor_color'
+       initialization.
+       (write_cursor): Use `virtual_screen.fg_color' to draw cursor.
+
 2008-08-18  Robert Millan  <rmh@aybabtu.com>
 
        Unify (identical) linux_normal.c files.

diff --git a/term/gfxterm.c b/term/gfxterm.c
index eb5136518b6ba0e0a2490c866bed4eb53b7b6074..8efcd91a267773f12111d0ce85569a810f0bd463 100644 (file)
--- a/term/gfxterm.c
+++ b/term/gfxterm.c
@@ -42,7 +42,6 @@
 #define DEFAULT_STANDARD_COLOR  0x07
 #define DEFAULT_NORMAL_COLOR    0x07
 #define DEFAULT_HIGHLIGHT_COLOR 0x70
-#define DEFAULT_CURSOR_COLOR   0x07
 
 struct grub_dirty_region
 {
@@ -100,7 +99,6 @@ struct grub_virtual_screen
   /* Color settings.  */
   grub_video_color_t fg_color;
   grub_video_color_t bg_color;
-  grub_video_color_t cursor_color;
 
   /* Text buffer for virtual screen.  Contains (columns * rows) number
      of entries.  */
@@ -219,8 +217,6 @@ grub_virtual_screen_setup (unsigned int x, unsigned int y,
   
   set_term_color (virtual_screen.term_color);
 
-  virtual_screen.cursor_color = grub_video_map_color (DEFAULT_CURSOR_COLOR);
-
   grub_video_set_active_render_target (GRUB_VIDEO_RENDER_TARGET_DISPLAY);
 
   return grub_errno;
@@ -709,7 +705,7 @@ write_cursor (void)
   width = virtual_screen.char_width;
   height = 2;
 
-  color = virtual_screen.cursor_color;
+  color = virtual_screen.fg_color;
 
   /* Render cursor to text layer.  */
   grub_video_set_active_render_target (text_layer);