merge trunk

This commit is contained in:
Colin Watson committed 2011-04-21 11:07:10 +01:00
commit 1eb44ae37e
301 files changed
+8465 -1449

No files matched your search

+2 -10
View File
@@ -40,13 +40,5 @@
(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_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.
(grub_gfxterm_background_image_cmd): Change blend_text_bg when
changing bitmap.