vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

2008-01-01 Vesa Jaaskelainen <chaac@nic.fi>

Browse source 
* include/grub/video.h: Added grub_video_unmap_color and
        grub_video_get_active_render_target.
        (grub_video_adapter): Added unmap_color and get_active_render_target.

        * video/video.c: Added grub_video_unmap_color and
        grub_video_get_active_render_target.
        (grub_video_get_info): Changed method to accept NULL pointer as an
        argument to allow detection of active video adapter.

        * video/i386/pc/vbe.c: Renamed grub_video_vbe_unmap_color as
        grub_video_vbe_unmap_color_int.
        Added grub_video_vbe_unmap_color and
        grub_video_vbe_get_active_render_target.
        (grub_video_vbe_adapter): Added unmap_color and
        get_active_render_target.

        * video/i386/pc/vbeblit.c: Replaced grub_video_vbe_unmap_color usage
        with grub_video_vbe_unmap_color_int.

        * term/gfxterm.c (DEFAULT_STANDARD_COLOR): Added.
        (DEFAULT_NORMAL_COLOR): Likewise.
        (DEFAULT_HIGHLIGHT_COLOR) Likewise.
        (DEFAULT_FG_COLOR): Removed.
        (DEFAULT_BG_COLOR): Likewise.
        (DEFAULT_CURSOR_COLOR): Changed value.
        (grub_virtual_screen): Added standard_color_setting,
        normal_color_setting, highlight_color_setting and term_color.
        (grub_virtual_screen): Removed fg_color_setting and bg_color_setting.
        (bitmap_width): Added.
        (bitmap_height): Likewise.
        (bitmap): Likewise.
        (set_term_color): Likewise.
        (grub_virtual_screen_setup): Changed to use new terminal coloring
        settings.
        (grub_gfxterm_init): Added init for bitmap.
        (grub_gfxterm_fini): Added destroy for bitmap.
        (redraw_screen_rect): Updated to use background bitmap and new
        terminal coloring.
        (scroll_up): Added optimization for case when there is no bitmap.
        (grub_gfxterm_cls): Fixed to use correct background color.
        (grub_virtual_screen_setcolorstate): Changed to use new terminal
        coloring.
        (grub_virtual_screen_setcolor): Likewise.
        (grub_virtual_screen_getcolor): Added.
        (grub_gfxterm_background_image_cmd): Likewise.
        (grub_video_term): Added setcolor and getcolor.
        (MOD_INIT): Added registration of background_image command.
        (MOD_TERM): Added unregistration for background_image command.
This commit is contained in:
chaac 2008-01-01 12:02:07 +00:00
parent df26671616
commit dbfdce36f1
7 changed files with 380 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
ChangeLog
View file

@ -1,3 +1,54 @@
2008-01-01 Vesa Jaaskelainen <chaac@nic.fi>
* include/grub/video.h: Added grub_video_unmap_color and
grub_video_get_active_render_target.
(grub_video_adapter): Added unmap_color and get_active_render_target.
* video/video.c: Added grub_video_unmap_color and
grub_video_get_active_render_target.
(grub_video_get_info): Changed method to accept NULL pointer as an
argument to allow detection of active video adapter.
* video/i386/pc/vbe.c: Renamed grub_video_vbe_unmap_color as
grub_video_vbe_unmap_color_int.
Added grub_video_vbe_unmap_color and
grub_video_vbe_get_active_render_target.
(grub_video_vbe_adapter): Added unmap_color and
get_active_render_target.
* video/i386/pc/vbeblit.c: Replaced grub_video_vbe_unmap_color usage
with grub_video_vbe_unmap_color_int.
* term/gfxterm.c (DEFAULT_STANDARD_COLOR): Added.
(DEFAULT_NORMAL_COLOR): Likewise.
(DEFAULT_HIGHLIGHT_COLOR) Likewise.
(DEFAULT_FG_COLOR): Removed.
(DEFAULT_BG_COLOR): Likewise.
(DEFAULT_CURSOR_COLOR): Changed value.
(grub_virtual_screen): Added standard_color_setting,
normal_color_setting, highlight_color_setting and term_color.
(grub_virtual_screen): Removed fg_color_setting and bg_color_setting.
(bitmap_width): Added.
(bitmap_height): Likewise.
(bitmap): Likewise.
(set_term_color): Likewise.
(grub_virtual_screen_setup): Changed to use new terminal coloring
settings.
(grub_gfxterm_init): Added init for bitmap.
(grub_gfxterm_fini): Added destroy for bitmap.
(redraw_screen_rect): Updated to use background bitmap and new
terminal coloring.
(scroll_up): Added optimization for case when there is no bitmap.
(grub_gfxterm_cls): Fixed to use correct background color.
(grub_virtual_screen_setcolorstate): Changed to use new terminal
coloring.
(grub_virtual_screen_setcolor): Likewise.
(grub_virtual_screen_getcolor): Added.
(grub_gfxterm_background_image_cmd): Likewise.
(grub_video_term): Added setcolor and getcolor.
(MOD_INIT): Added registration of background_image command.
(MOD_TERM): Added unregistration for background_image command.
2007-12-30 Pavel Roskin <proski@gnu.org> 2007-12-30 Pavel Roskin <proski@gnu.org>
* loader/multiboot_loader.c: Fix multiboot command * loader/multiboot_loader.c: Fix multiboot command

18
include/grub/i386/pc/vbe.h
View file

@ -1,6 +1,6 @@
/* /*
* GRUB -- GRand Unified Bootloader * GRUB -- GRand Unified Bootloader
* Copyright (C) 2005,2006,2007 Free Software Foundation, Inc. * Copyright (C) 2005,2006,2007,2008 Free Software Foundation, Inc.
* *
* GRUB is free software: you can redistribute it and/or modify * GRUB is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -240,9 +240,17 @@ grub_video_color_t grub_video_vbe_map_rgba (grub_uint8_t red,
grub_uint8_t blue, grub_uint8_t blue,
grub_uint8_t alpha); grub_uint8_t alpha);
void grub_video_vbe_unmap_color (struct grub_video_i386_vbeblit_info *source, grub_err_t grub_video_vbe_unmap_color (grub_video_color_t color,
grub_video_color_t color, grub_uint8_t *red, grub_uint8_t *red,
grub_uint8_t *green, grub_uint8_t *blue, grub_uint8_t *green,
grub_uint8_t *alpha); grub_uint8_t *blue,
grub_uint8_t *alpha);
void grub_video_vbe_unmap_color_int (struct grub_video_i386_vbeblit_info *source,
grub_video_color_t color,
grub_uint8_t *red,
grub_uint8_t *green,
grub_uint8_t *blue,
grub_uint8_t *alpha);
#endif /* ! GRUB_VBE_MACHINE_HEADER */ #endif /* ! GRUB_VBE_MACHINE_HEADER */

14
include/grub/video.h
View file

@ -1,6 +1,6 @@
/* /*
* GRUB -- GRand Unified Bootloader * GRUB -- GRand Unified Bootloader
* Copyright (C) 2006,2007 Free Software Foundation, Inc. * Copyright (C) 2006,2007,2008 Free Software Foundation, Inc.
* *
* GRUB is free software: you can redistribute it and/or modify * GRUB is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -173,6 +173,10 @@ struct grub_video_adapter
grub_video_color_t (*map_rgba) (grub_uint8_t red, grub_uint8_t green, grub_video_color_t (*map_rgba) (grub_uint8_t red, grub_uint8_t green,
grub_uint8_t blue, grub_uint8_t alpha); grub_uint8_t blue, grub_uint8_t alpha);
grub_err_t (*unmap_color) (grub_video_color_t color,
grub_uint8_t *red, grub_uint8_t *green,
grub_uint8_t *blue, grub_uint8_t *alpha);
grub_err_t (*fill_rect) (grub_video_color_t color, int x, int y, grub_err_t (*fill_rect) (grub_video_color_t color, int x, int y,
unsigned int width, unsigned int height); unsigned int width, unsigned int height);
@ -201,6 +205,8 @@ struct grub_video_adapter
grub_err_t (*set_active_render_target) (struct grub_video_render_target *target); grub_err_t (*set_active_render_target) (struct grub_video_render_target *target);
grub_err_t (*get_active_render_target) (struct grub_video_render_target **target);
/* The next video adapter. */ /* The next video adapter. */
struct grub_video_adapter *next; struct grub_video_adapter *next;
}; };
@ -239,6 +245,10 @@ grub_video_color_t grub_video_map_rgb (grub_uint8_t red, grub_uint8_t green,
grub_video_color_t grub_video_map_rgba (grub_uint8_t red, grub_uint8_t green, grub_video_color_t grub_video_map_rgba (grub_uint8_t red, grub_uint8_t green,
grub_uint8_t blue, grub_uint8_t alpha); grub_uint8_t blue, grub_uint8_t alpha);
grub_err_t grub_video_unmap_color (grub_video_color_t color,
grub_uint8_t *red, grub_uint8_t *green,
grub_uint8_t *blue, grub_uint8_t *alpha);
grub_err_t grub_video_fill_rect (grub_video_color_t color, int x, int y, grub_err_t grub_video_fill_rect (grub_video_color_t color, int x, int y,
unsigned int width, unsigned int height); unsigned int width, unsigned int height);
@ -270,4 +280,6 @@ grub_err_t grub_video_delete_render_target (struct grub_video_render_target *tar
grub_err_t grub_video_set_active_render_target (struct grub_video_render_target *target); grub_err_t grub_video_set_active_render_target (struct grub_video_render_target *target);
grub_err_t grub_video_get_active_render_target (struct grub_video_render_target **target);
#endif /* ! GRUB_VIDEO_HEADER */ #endif /* ! GRUB_VIDEO_HEADER */

260
term/gfxterm.c
View file

@ -1,6 +1,6 @@
/* /*
* GRUB -- GRand Unified Bootloader * GRUB -- GRand Unified Bootloader
* Copyright (C) 2006,2007 Free Software Foundation, Inc. * Copyright (C) 2006,2007,2008 Free Software Foundation, Inc.
* *
* GRUB is free software: you can redistribute it and/or modify * GRUB is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -28,6 +28,7 @@
#include <grub/mm.h> #include <grub/mm.h>
#include <grub/env.h> #include <grub/env.h>
#include <grub/video.h> #include <grub/video.h>
#include <grub/bitmap.h>
#define DEFAULT_VIDEO_WIDTH 640 #define DEFAULT_VIDEO_WIDTH 640
#define DEFAULT_VIDEO_HEIGHT 480 #define DEFAULT_VIDEO_HEIGHT 480
@ -38,9 +39,10 @@
#define DEFAULT_BORDER_WIDTH 10 #define DEFAULT_BORDER_WIDTH 10
#define DEFAULT_FG_COLOR 0x0a #define DEFAULT_STANDARD_COLOR 0x07
#define DEFAULT_BG_COLOR 0x00 #define DEFAULT_NORMAL_COLOR 0x07
#define DEFAULT_CURSOR_COLOR 0x0f #define DEFAULT_HIGHLIGHT_COLOR 0x70
#define DEFAULT_CURSOR_COLOR 0x07
struct grub_dirty_region struct grub_dirty_region
{ {
@ -89,9 +91,13 @@ struct grub_virtual_screen
unsigned int cursor_y; unsigned int cursor_y;
int cursor_state; int cursor_state;
/* Terminal color settings. */
grub_uint8_t standard_color_setting;
grub_uint8_t normal_color_setting;
grub_uint8_t highlight_color_setting;
grub_uint8_t term_color;
/* Color settings. */ /* Color settings. */
grub_video_color_t fg_color_setting;
grub_video_color_t bg_color_setting;
grub_video_color_t fg_color; grub_video_color_t fg_color;
grub_video_color_t bg_color; grub_video_color_t bg_color;
grub_video_color_t cursor_color; grub_video_color_t cursor_color;
@ -108,6 +114,10 @@ static struct grub_video_mode_info mode_info;
static struct grub_video_render_target *text_layer; static struct grub_video_render_target *text_layer;
static unsigned int bitmap_width;
static unsigned int bitmap_height;
static struct grub_video_bitmap *bitmap;
static struct grub_dirty_region dirty_region; static struct grub_dirty_region dirty_region;
static void dirty_region_reset (void); static void dirty_region_reset (void);
@ -117,6 +127,32 @@ static int dirty_region_is_empty (void);
static void dirty_region_add (int x, int y, static void dirty_region_add (int x, int y,
unsigned int width, unsigned int height); unsigned int width, unsigned int height);
static void
set_term_color (grub_uint8_t term_color)
{
struct grub_video_render_target *old_target;
/* Save previous target and switch to text layer. */
grub_video_get_active_render_target (&old_target);
grub_video_set_active_render_target (text_layer);
/* Map terminal color to text layer compatible video colors. */
virtual_screen.fg_color = grub_video_map_color(term_color & 0x0f);
/* Special case: use black as transparent color. */
if (((term_color >> 4) & 0x0f) == 0)
{
virtual_screen.bg_color = grub_video_map_rgba(0, 0, 0, 0);
}
else
{
virtual_screen.bg_color = grub_video_map_color((term_color >> 4) & 0x0f);
}
/* Restore previous target. */
grub_video_set_active_render_target (old_target);
}
static void static void
grub_virtual_screen_free (void) grub_virtual_screen_free (void)
{ {
@ -175,10 +211,14 @@ grub_virtual_screen_setup (unsigned int x, unsigned int y,
we can only have those after mode is initialized. */ we can only have those after mode is initialized. */
grub_video_set_active_render_target (text_layer); grub_video_set_active_render_target (text_layer);
virtual_screen.fg_color_setting = grub_video_map_color (DEFAULT_FG_COLOR); virtual_screen.standard_color_setting = DEFAULT_STANDARD_COLOR;
virtual_screen.bg_color_setting = grub_video_map_color (DEFAULT_BG_COLOR); virtual_screen.normal_color_setting = DEFAULT_NORMAL_COLOR;
virtual_screen.fg_color = virtual_screen.fg_color_setting; virtual_screen.highlight_color_setting = DEFAULT_HIGHLIGHT_COLOR;
virtual_screen.bg_color = virtual_screen.bg_color_setting;
virtual_screen.term_color = virtual_screen.normal_color_setting;
set_term_color (virtual_screen.term_color);
virtual_screen.cursor_color = grub_video_map_color (DEFAULT_CURSOR_COLOR); virtual_screen.cursor_color = grub_video_map_color (DEFAULT_CURSOR_COLOR);
grub_video_set_active_render_target (GRUB_VIDEO_RENDER_TARGET_DISPLAY); grub_video_set_active_render_target (GRUB_VIDEO_RENDER_TARGET_DISPLAY);
@ -427,6 +467,7 @@ grub_gfxterm_init (void)
/* Make sure screen is black. */ /* Make sure screen is black. */
color = grub_video_map_rgb (0, 0, 0); color = grub_video_map_rgb (0, 0, 0);
grub_video_fill_rect (color, 0, 0, mode_info.width, mode_info.height); grub_video_fill_rect (color, 0, 0, mode_info.width, mode_info.height);
bitmap = 0;
/* Leave borders for virtual screen. */ /* Leave borders for virtual screen. */
width = mode_info.width - (2 * DEFAULT_BORDER_WIDTH); width = mode_info.width - (2 * DEFAULT_BORDER_WIDTH);
@ -450,6 +491,12 @@ grub_gfxterm_init (void)
static grub_err_t static grub_err_t
grub_gfxterm_fini (void) grub_gfxterm_fini (void)
{ {
if (bitmap)
{
grub_video_bitmap_destroy (bitmap);
bitmap = 0;
}
grub_virtual_screen_free (); grub_virtual_screen_free ();
grub_video_restore (); grub_video_restore ();
@ -465,15 +512,72 @@ redraw_screen_rect (unsigned int x, unsigned int y,
grub_video_set_active_render_target (GRUB_VIDEO_RENDER_TARGET_DISPLAY); grub_video_set_active_render_target (GRUB_VIDEO_RENDER_TARGET_DISPLAY);
/* Render background layer. */
color = virtual_screen.bg_color;
grub_video_fill_rect (color, x, y, width, height);
/* Render text layer. */ if (bitmap)
grub_video_blit_render_target (text_layer, GRUB_VIDEO_BLIT_BLEND, x, y, {
x - virtual_screen.offset_x, /* Render bitmap as background. */
y - virtual_screen.offset_y, grub_video_blit_bitmap (bitmap, GRUB_VIDEO_BLIT_REPLACE, x, y,
width, height); x, y,
width, height);
/* If bitmap is smaller than requested blit area, use background
color. */
color = virtual_screen.bg_color;
/* Fill right side of the bitmap if needed. */
if ((x + width >= bitmap_width) && (y < bitmap_height))
{
int w = (x + width) - bitmap_width;
int h = height;
unsigned int tx = x;
if (y + height >= bitmap_height)
{
h = bitmap_height - y;
}
if (bitmap_width > tx)
{
tx = bitmap_width;
}
/* Render background layer. */
grub_video_fill_rect (color, tx, y, w, h);
}
/* Fill bottom side of the bitmap if needed. */
if (y + height >= bitmap_height)
{
int h = (y + height) - bitmap_height;
unsigned int ty = y;
if (bitmap_height > ty)
{
ty = bitmap_height;
}
/* Render background layer. */
grub_video_fill_rect (color, x, ty, width, h);
}
/* Render text layer as blended. */
grub_video_blit_render_target (text_layer, GRUB_VIDEO_BLIT_BLEND, x, y,
x - virtual_screen.offset_x,
y - virtual_screen.offset_y,
width, height);
}
else
{
/* Render background layer. */
color = virtual_screen.bg_color;
grub_video_fill_rect (color, x, y, width, height);
/* Render text layer as replaced (to get texts background color). */
grub_video_blit_render_target (text_layer, GRUB_VIDEO_BLIT_REPLACE, x, y,
x - virtual_screen.offset_x,
y - virtual_screen.offset_y,
width, height);
}
} }
static void static void
@ -623,6 +727,16 @@ scroll_up (void)
unsigned int i; unsigned int i;
grub_video_color_t color; grub_video_color_t color;
/* If we don't have background bitmap, remove cursor. */
if (!bitmap)
{
/* Remove cursor. */
write_char ();
/* Redraw only changed regions. */
dirty_region_redraw ();
}
/* Scroll text buffer with one line to up. */ /* Scroll text buffer with one line to up. */
grub_memmove (virtual_screen.text_buffer, grub_memmove (virtual_screen.text_buffer,
virtual_screen.text_buffer + virtual_screen.columns, virtual_screen.text_buffer + virtual_screen.columns,
@ -647,9 +761,27 @@ scroll_up (void)
color = virtual_screen.bg_color; color = virtual_screen.bg_color;
grub_video_scroll (color, 0, -virtual_screen.char_height); grub_video_scroll (color, 0, -virtual_screen.char_height);
grub_video_set_active_render_target (GRUB_VIDEO_RENDER_TARGET_DISPLAY); grub_video_set_active_render_target (GRUB_VIDEO_RENDER_TARGET_DISPLAY);
/* If we have bitmap, re-draw screen, otherwise scroll physical screen too. */
if (bitmap)
{
/* Mark virtual screen to be redrawn. */
dirty_region_add_virtualscreen ();
}
else
{
/* Clear new border area. */
grub_video_fill_rect (color,
virtual_screen.offset_x, virtual_screen.offset_y,
virtual_screen.width, virtual_screen.char_height);
/* Scroll physical screen. */
grub_video_scroll (color, 0, -virtual_screen.char_height);
/* Mark virtual screen to be redrawn. */ /* Draw cursor if visible. */
dirty_region_add_virtualscreen (); if (virtual_screen.cursor_state)
write_cursor ();
}
} }
static void static void
@ -812,7 +944,7 @@ grub_gfxterm_cls (void)
/* Clear text layer. */ /* Clear text layer. */
grub_video_set_active_render_target (text_layer); grub_video_set_active_render_target (text_layer);
color = virtual_screen.bg_color_setting; color = virtual_screen.bg_color;
grub_video_fill_rect (color, 0, 0, mode_info.width, mode_info.height); grub_video_fill_rect (color, 0, 0, mode_info.width, mode_info.height);
grub_video_set_active_render_target (GRUB_VIDEO_RENDER_TARGET_DISPLAY); grub_video_set_active_render_target (GRUB_VIDEO_RENDER_TARGET_DISPLAY);
@ -826,17 +958,39 @@ grub_virtual_screen_setcolorstate (grub_term_color_state state)
switch (state) switch (state)
{ {
case GRUB_TERM_COLOR_STANDARD: case GRUB_TERM_COLOR_STANDARD:
virtual_screen.term_color = virtual_screen.standard_color_setting;
break;
case GRUB_TERM_COLOR_NORMAL: case GRUB_TERM_COLOR_NORMAL:
virtual_screen.fg_color = virtual_screen.fg_color_setting; virtual_screen.term_color = virtual_screen.normal_color_setting;
virtual_screen.bg_color = virtual_screen.bg_color_setting;
break; break;
case GRUB_TERM_COLOR_HIGHLIGHT: case GRUB_TERM_COLOR_HIGHLIGHT:
virtual_screen.fg_color = virtual_screen.bg_color_setting; virtual_screen.term_color = virtual_screen.highlight_color_setting;
virtual_screen.bg_color = virtual_screen.fg_color_setting;
break; break;
default: default:
break; break;
} }
/* Change color to virtual terminal. */
set_term_color (virtual_screen.term_color);
}
static void
grub_virtual_screen_setcolor (grub_uint8_t normal_color,
grub_uint8_t highlight_color)
{
virtual_screen.normal_color_setting = normal_color;
virtual_screen.highlight_color_setting = highlight_color;
}
static void
grub_virtual_screen_getcolor (grub_uint8_t *normal_color,
grub_uint8_t *highlight_color)
{
*normal_color = virtual_screen.normal_color_setting;
*highlight_color = virtual_screen.highlight_color_setting;
} }
static void static void
@ -860,6 +1014,52 @@ grub_gfxterm_refresh (void)
dirty_region_redraw (); dirty_region_redraw ();
} }
static grub_err_t
grub_gfxterm_background_image_cmd (struct grub_arg_list *state __attribute__ ((unused)),
int argc,
char **args)
{
/* Check that we have video adapter active. */
if (grub_video_get_info(NULL) != GRUB_ERR_NONE)
return grub_errno;
/* Destroy existing background bitmap if loaded. */
if (bitmap)
{
grub_video_bitmap_destroy (bitmap);
bitmap = 0;
/* Mark whole screen as dirty. */
dirty_region_reset ();
dirty_region_add (0, 0, mode_info.width, mode_info.height);
}
/* If filename was provided, try to load that. */
if (argc >= 1)
{
/* Try to load new one. */
grub_video_bitmap_load (&bitmap, args[0]);
if (grub_errno != GRUB_ERR_NONE)
return grub_errno;
/* If bitmap was loaded correctly, display it. */
if (bitmap)
{
/* Determine bitmap dimensions. */
bitmap_width = grub_video_bitmap_get_width (bitmap);
bitmap_height = grub_video_bitmap_get_width (bitmap);
/* Mark whole screen as dirty. */
dirty_region_reset ();
dirty_region_add (0, 0, mode_info.width, mode_info.height);
}
}
/* All was ok. */
grub_errno = GRUB_ERR_NONE;
return grub_errno;
}
static struct grub_term grub_video_term = static struct grub_term grub_video_term =
{ {
.name = "gfxterm", .name = "gfxterm",
@ -874,6 +1074,8 @@ static struct grub_term grub_video_term =
.gotoxy = grub_gfxterm_gotoxy, .gotoxy = grub_gfxterm_gotoxy,
.cls = grub_gfxterm_cls, .cls = grub_gfxterm_cls,
.setcolorstate = grub_virtual_screen_setcolorstate, .setcolorstate = grub_virtual_screen_setcolorstate,
.setcolor = grub_virtual_screen_setcolor,
.getcolor = grub_virtual_screen_getcolor,
.setcursor = grub_gfxterm_setcursor, .setcursor = grub_gfxterm_setcursor,
.refresh = grub_gfxterm_refresh, .refresh = grub_gfxterm_refresh,
.flags = 0, .flags = 0,
@ -884,9 +1086,17 @@ GRUB_MOD_INIT(term_gfxterm)
{ {
my_mod = mod; my_mod = mod;
grub_term_register (&grub_video_term); grub_term_register (&grub_video_term);
grub_register_command ("background_image",
grub_gfxterm_background_image_cmd,
GRUB_COMMAND_FLAG_BOTH,
"background_image",
"Load background image for active terminal",
0);
} }
GRUB_MOD_FINI(term_gfxterm) GRUB_MOD_FINI(term_gfxterm)
{ {
grub_unregister_command ("bgimage");
grub_term_unregister (&grub_video_term); grub_term_unregister (&grub_video_term);
} }

34
video/i386/pc/vbe.c
View file

@ -1,6 +1,6 @@
/* /*
* GRUB -- GRand Unified Bootloader * GRUB -- GRand Unified Bootloader
* Copyright (C) 2005,2006,2007 Free Software Foundation, Inc. * Copyright (C) 2005,2006,2007,2008 Free Software Foundation, Inc.
* *
* GRUB is free software: you can redistribute it and/or modify * GRUB is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -754,11 +754,25 @@ grub_video_vbe_map_rgba (grub_uint8_t red, grub_uint8_t green,
} }
} }
grub_err_t grub_video_vbe_unmap_color (grub_video_color_t color,
grub_uint8_t *red, grub_uint8_t *green,
grub_uint8_t *blue, grub_uint8_t *alpha)
{
struct grub_video_i386_vbeblit_info target_info;
target_info.mode_info = &render_target->mode_info;
target_info.data = render_target->data;
grub_video_vbe_unmap_color_int (&target_info, color, red, green, blue, alpha);
return GRUB_ERR_NONE;
}
void void
grub_video_vbe_unmap_color (struct grub_video_i386_vbeblit_info * source, grub_video_vbe_unmap_color_int (struct grub_video_i386_vbeblit_info * source,
grub_video_color_t color, grub_video_color_t color,
grub_uint8_t *red, grub_uint8_t *green, grub_uint8_t *red, grub_uint8_t *green,
grub_uint8_t *blue, grub_uint8_t *alpha) grub_uint8_t *blue, grub_uint8_t *alpha)
{ {
struct grub_video_mode_info *mode_info; struct grub_video_mode_info *mode_info;
mode_info = source->mode_info; mode_info = source->mode_info;
@ -1510,6 +1524,14 @@ grub_video_vbe_set_active_render_target (struct grub_video_render_target *target
return GRUB_ERR_NONE; return GRUB_ERR_NONE;
} }
static grub_err_t
grub_video_vbe_get_active_render_target (struct grub_video_render_target **target)
{
*target = render_target;
return GRUB_ERR_NONE;
}
static struct grub_video_adapter grub_video_vbe_adapter = static struct grub_video_adapter grub_video_vbe_adapter =
{ {
.name = "VESA BIOS Extension Video Driver", .name = "VESA BIOS Extension Video Driver",
@ -1525,6 +1547,7 @@ static struct grub_video_adapter grub_video_vbe_adapter =
.map_color = grub_video_vbe_map_color, .map_color = grub_video_vbe_map_color,
.map_rgb = grub_video_vbe_map_rgb, .map_rgb = grub_video_vbe_map_rgb,
.map_rgba = grub_video_vbe_map_rgba, .map_rgba = grub_video_vbe_map_rgba,
.unmap_color = grub_video_vbe_unmap_color,
.fill_rect = grub_video_vbe_fill_rect, .fill_rect = grub_video_vbe_fill_rect,
.blit_glyph = grub_video_vbe_blit_glyph, .blit_glyph = grub_video_vbe_blit_glyph,
.blit_bitmap = grub_video_vbe_blit_bitmap, .blit_bitmap = grub_video_vbe_blit_bitmap,
@ -1534,6 +1557,7 @@ static struct grub_video_adapter grub_video_vbe_adapter =
.create_render_target = grub_video_vbe_create_render_target, .create_render_target = grub_video_vbe_create_render_target,
.delete_render_target = grub_video_vbe_delete_render_target, .delete_render_target = grub_video_vbe_delete_render_target,
.set_active_render_target = grub_video_vbe_set_active_render_target, .set_active_render_target = grub_video_vbe_set_active_render_target,
.get_active_render_target = grub_video_vbe_get_active_render_target,
.next = 0 .next = 0
}; };

10
video/i386/pc/vbeblit.c
View file

@ -1,6 +1,6 @@
/* /*
* GRUB -- GRand Unified Bootloader * GRUB -- GRand Unified Bootloader
* Copyright (C) 2006,2007 Free Software Foundation, Inc. * Copyright (C) 2006,2007,2008 Free Software Foundation, Inc.
* *
* GRUB is free software: you can redistribute it and/or modify * GRUB is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -281,7 +281,7 @@ grub_video_i386_vbeblit_index_R8G8B8A8 (struct grub_video_i386_vbeblit_info *dst
continue; continue;
} }
grub_video_vbe_unmap_color (dst, *dstptr, &dr, &dg, &db, &da); grub_video_vbe_unmap_color_int (dst, *dstptr, &dr, &dg, &db, &da);
dr = (dr * (255 - a) + sr * a) / 255; dr = (dr * (255 - a) + sr * a) / 255;
dg = (dg * (255 - a) + sg * a) / 255; dg = (dg * (255 - a) + sg * a) / 255;
@ -481,7 +481,7 @@ grub_video_i386_vbeblit_blend (struct grub_video_i386_vbeblit_info *dst,
grub_video_color_t dst_color; grub_video_color_t dst_color;
src_color = get_pixel (src, i + offset_x, j + offset_y); src_color = get_pixel (src, i + offset_x, j + offset_y);
grub_video_vbe_unmap_color (src, src_color, &src_red, &src_green, grub_video_vbe_unmap_color_int (src, src_color, &src_red, &src_green,
&src_blue, &src_alpha); &src_blue, &src_alpha);
if (src_alpha == 0) if (src_alpha == 0)
@ -497,7 +497,7 @@ grub_video_i386_vbeblit_blend (struct grub_video_i386_vbeblit_info *dst,
dst_color = get_pixel (dst, x + i, y + j); dst_color = get_pixel (dst, x + i, y + j);
grub_video_vbe_unmap_color (dst, dst_color, &dst_red, grub_video_vbe_unmap_color_int (dst, dst_color, &dst_red,
&dst_green, &dst_blue, &dst_alpha); &dst_green, &dst_blue, &dst_alpha);
dst_red = (((src_red * src_alpha) dst_red = (((src_red * src_alpha)
@ -539,7 +539,7 @@ grub_video_i386_vbeblit_replace (struct grub_video_i386_vbeblit_info *dst,
for (i = 0; i < width; i++) for (i = 0; i < width; i++)
{ {
src_color = get_pixel (src, i + offset_x, j + offset_y); src_color = get_pixel (src, i + offset_x, j + offset_y);
grub_video_vbe_unmap_color (src, src_color, &src_red, &src_green, grub_video_vbe_unmap_color_int (src, src_color, &src_red, &src_green,
&src_blue, &src_alpha); &src_blue, &src_alpha);
dst_color = grub_video_vbe_map_rgba (src_red, src_green, dst_color = grub_video_vbe_map_rgba (src_red, src_green,

35
video/video.c
View file

@ -1,6 +1,6 @@
/* /*
* GRUB -- GRand Unified Bootloader * GRUB -- GRand Unified Bootloader
* Copyright (C) 2006,2007 Free Software Foundation, Inc. * Copyright (C) 2006,2007,2008 Free Software Foundation, Inc.
* *
* GRUB is free software: you can redistribute it and/or modify * GRUB is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -134,6 +134,13 @@ grub_video_get_info (struct grub_video_mode_info *mode_info)
if (! grub_video_adapter_active) if (! grub_video_adapter_active)
return grub_error (GRUB_ERR_BAD_DEVICE, "No video mode activated"); return grub_error (GRUB_ERR_BAD_DEVICE, "No video mode activated");
/* If mode_info is NULL just report that video adapter is active. */
if (! mode_info)
{
grub_errno = GRUB_ERR_NONE;
return grub_errno;
}
return grub_video_adapter_active->get_info (mode_info); return grub_video_adapter_active->get_info (mode_info);
} }
@ -260,6 +267,22 @@ grub_video_map_rgba (grub_uint8_t red, grub_uint8_t green, grub_uint8_t blue,
return grub_video_adapter_active->map_rgba (red, green, blue, alpha); return grub_video_adapter_active->map_rgba (red, green, blue, alpha);
} }
/* Unmap video color back to RGBA components. */
grub_err_t
grub_video_unmap_color (grub_video_color_t color, grub_uint8_t *red,
grub_uint8_t *green, grub_uint8_t *blue,
grub_uint8_t *alpha)
{
if (! grub_video_adapter_active)
return grub_error (GRUB_ERR_BAD_DEVICE, "No video mode activated");
return grub_video_adapter_active->unmap_color (color,
red,
green,
blue,
alpha);
}
/* Fill rectangle using specified color. */ /* Fill rectangle using specified color. */
grub_err_t grub_err_t
grub_video_fill_rect (grub_video_color_t color, int x, int y, grub_video_fill_rect (grub_video_color_t color, int x, int y,
@ -366,6 +389,16 @@ grub_video_set_active_render_target (struct grub_video_render_target *target)
return grub_video_adapter_active->set_active_render_target (target); return grub_video_adapter_active->set_active_render_target (target);
} }
/* Get active render target. */
grub_err_t
grub_video_get_active_render_target (struct grub_video_render_target **target)
{
if (! grub_video_adapter_active)
return grub_error (GRUB_ERR_BAD_DEVICE, "No video mode activated");
return grub_video_adapter_active->get_active_render_target (target);
}
/* Initialize Video API module. */ /* Initialize Video API module. */
GRUB_MOD_INIT(video_video) GRUB_MOD_INIT(video_video)
{ {