[1821] 2008-08-19 Robert Millan <address@hidden>

[Robert Millan]

Revision: 1821
          http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=1821
Author:   robertmh
Date:     2008-08-19 19:20:33 +0000 (Tue, 19 Aug 2008)

Log Message:
-----------
2008-08-19  Robert Millan  <address@hidden>

        * 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.

Modified Paths:
--------------
    trunk/grub2/ChangeLog
    trunk/grub2/term/gfxterm.c

Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog       2008-08-18 13:46:31 UTC (rev 1820)
+++ trunk/grub2/ChangeLog       2008-08-19 19:20:33 UTC (rev 1821)
@@ -1,3 +1,11 @@
+2008-08-19  Robert Millan  <address@hidden>
+
+       * 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  <address@hidden>
 
        Unify (identical) linux_normal.c files.

Modified: trunk/grub2/term/gfxterm.c
===================================================================
--- trunk/grub2/term/gfxterm.c  2008-08-18 13:46:31 UTC (rev 1820)
+++ trunk/grub2/term/gfxterm.c  2008-08-19 19:20:33 UTC (rev 1821)
@@ -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 @@
   /* 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 @@
   
   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 @@
   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);