merge trunk

diff --cc ChangeLog.parse-color
index 81628e89f4e8c1fdfdd0d96db67203e3a8704953,0000000000000000000000000000000000000000..9645fa66b59c51c4c78ec6e1f7c82ea5d19b39b0
mode 100644,000000..100644
--- 1/ChangeLog.parse-color
--- /dev/null
+++ b/ChangeLog.parse-color
@@@ -1,52 -1,0 +1,44 @@@
-       (grub_gfxterm_fullscreen): Change blend_text_bg when changing
-       bitmap.
-       (destroy_window): Likewise.
-       (grub_gfxterm_background_image_cmd): Likewise.
- 
-       Fix border repainting.
- 
-       * grub-core/term/gfxterm.c (dirty_region_add): When a repaint is
-       already scheduled, merge the virtual screen with the requested
-       region rather than repainting only the virtual screen.
 +2010-12-23  Colin Watson  <cjwatson@ubuntu.com>
 +
 +      Move gfxmenu color handling to video, so that gfxterm can use it
 +      too.
 +
 +      * grub-core/gfxmenu/named_colors.c: Move to ...
 +      * grub-core/video/colors.c: ... here.  Rename
 +      grub_gui_get_named_color to grub_video_get_named_color.
 +      * grub-core/gfxmenu/gui_string_util.c (my_isxdigit): Move to ...
 +      * grub-core/video/colors.c (my_isxdigit): ... here.
 +      * grub-core/gfxmenu/gui_string_util.c (parse_hex_color_component):
 +      Move to ...
 +      * grub-core/video/colors.c (parse_hex_color_component): ... here.
 +      * grub-core/gfxmenu/gui_string_util.c (grub_gui_parse_color): Move
 +      to ...
 +      * grub-core/video/colors.c (grub_video_parse_color): ... here.
 +
 +      * include/grub/gui.h (grub_gui_color_t): Move to ...
 +      * include/grub/video.h (grub_video_rgba_color_t): ... here.
 +      * include/grub/gui.h (grub_gui_color_rgb): Move to ...
 +      * include/grub/video.h (grub_video_rgba_color_rgb): ... here.
 +      * include/grub/gui.h (grub_gui_map_color): Move to ...
 +      * include/grub/video.h (grub_video_map_rgba_color): ... here.
 +      * include/grub/gui_string_util.h (grub_gui_get_named_color): Move
 +      to ...
 +      * include/grub/video.h (grub_video_get_named_color): ... here.
 +      * include/grub/gui_string_util.h (grub_gui_parse_color): Move to ...
 +      * include/grub/video.h (grub_video_parse_color): ... here.
 +
 +      * grub-core/Makefile.core.def (kernel) [videoinkernel]: Add
 +      video/colors.c.
 +      (gfxmenu): Remove gfxmenu/named_colors.c.
 +      (video) [videomodules]: Add video/colors.c.
 +
 +      Add a background_color command.
 +
 +      * grub-core/term/gfxterm.c (grub_gfxterm_background_color_cmd): New
 +      function.
 +      (GRUB_MOD_INIT): Register background_color command.
 +      (GRUB_MOD_FINI): Unregister background_color command.
 +      (redraw_screen_rect): Allow blend/replace of text layer to be
 +      controlled independently from whether there is a background bitmap.
++      (grub_gfxterm_background_image_cmd): Change blend_text_bg when
++      changing bitmap.

diff --cc grub-core/Makefile.core.def
Simple merge

diff --cc grub-core/gfxmenu/gui_list.c
Simple merge

diff --cc grub-core/term/gfxterm.c
Simple merge