2006-03-14 Vesa Jaaskelainen <chaac@nic.fi>
* DISTLIST: Added include/grub/video.h, term/gfxterm.c,
video/video.c, commands/videotest.c. Removed term/i386/pc/vesafb.c.
* conf/i386-pc.rmk (pkgdata_MODULES): Added video.mod,
gfxterm.mod, videotest.mod. Removed vga.mod, vesafb.mod.
(video_mod_SOURCES): Added.
(video_mod_CFLAGS): Likewise.
(video_mod_LDFLAGS): Likewise.
(gfxterm_mod_SOURCES): Likewise.
(gfxterm_mod_CFLAGS): Likewise.
(gfxterm_mod_LDFLAGS): Likewise.
(videotest_mod_SOURCES): Likewise.
(videotest_mod_CFLAGS): Likewise.
(videotest_mod_LDFLAGS): Likewise.
(vesafb_mod_SOURCES): Removed.
(vesafb_mod_CFLAGS): Likewise.
(vesafb_mod_LDFLAGS): Likewise.
(vga_mod_SOURCES): Likewise.
(vga_mod_CFLAGS): Likewise.
(vga_mod_LDFLAGS): Likewise.
* commands/videotest.c: New file.
* font/manager.c (fill_with_default_glyph): Modified to use
grub_font_glyph.
(grub_font_get_glyph): Likewise.
(fontmanager): Renamed from this...
(font_manager): ... to this.
* include/grub/font.h (grub_font_glyph): Added new structure.
(grub_font_get_glyph): Modified to use grub_font_glyph.
* include/grub/misc.h (grub_abs): Added as inline function.
* include/grub/video.h: New file.
* include/grub/i386/pc/vbe.h (GRUB_VBE_STATUS_OK): New macro.
(GRUB_VBE_MEMORY_MODEL_PACKED_PIXEL): Likewise.
(GRUB_VBE_MEMORY_MODEL_DIRECT_COLOR): Likewise.
(grub_vbe_get_controller_info): Renamed from this...
(grub_vbe_bios_get_controller_info): ... to this.
(grub_vbe_get_mode_info): Renamed from this...
(grub_vbe_bios_get_mode_info): ... to this.
(grub_vbe_set_mode): Renamed from this...
(grub_vbe_bios_set_mode): ... to this.
(grub_vbe_get_mode): Renamed from this...
(grub_vbe_bios_get_mode): ... to this.
(grub_vbe_set_memory_window): Renamed from this...
(grub_vbe_bios_set_memory_window): ... to this.
(grub_vbe_get_memory_window): Renamed from this...
(grub_vbe_bios_get_memory_window): ... to this.
(grub_vbe_set_scanline_length): Renamed from this...
(grub_vbe_set_scanline_length): ... to this.
(grub_vbe_get_scanline_length): Renamed from this...
(grub_vbe_bios_get_scanline_length): ... to this.
(grub_vbe_set_display_start): Renamed from this...
(grub_vbe_bios_set_display_start): ... to this.
(grub_vbe_get_display_start): Renamed from this...
(grub_vbe_bios_get_display_start): ... to this.
(grub_vbe_set_palette_data): Renamed from this...
(grub_vbe_bios_set_palette_data): ... to this.
(grub_vbe_set_pixel_rgb): Removed.
(grub_vbe_set_pixel_index): Likewise.
* kern/i386/pc/startup.S (grub_vbe_get_controller_info): Renamed
from this...
(grub_vbe_bios_get_controller_info): ... to this.
(grub_vbe_get_mode_info): Renamed from this...
(grub_vbe_bios_get_mode_info): ... to this.
(grub_vbe_set_mode): Renamed from this...
(grub_vbe_bios_set_mode): ... to this.
(grub_vbe_get_mode): Renamed from this...
(grub_vbe_bios_get_mode): ... to this.
(grub_vbe_set_memory_window): Renamed from this...
(grub_vbe_bios_set_memory_window): ... to this.
(grub_vbe_get_memory_window): Renamed from this...
(grub_vbe_bios_get_memory_window): ... to this.
(grub_vbe_set_scanline_length): Renamed from this...
(grub_vbe_set_scanline_length): ... to this.
(grub_vbe_get_scanline_length): Renamed from this...
(grub_vbe_bios_get_scanline_length): ... to this.
(grub_vbe_set_display_start): Renamed from this...
(grub_vbe_bios_set_display_start): ... to this.
(grub_vbe_get_display_start): Renamed from this...
(grub_vbe_bios_get_display_start): ... to this.
(grub_vbe_set_palette_data): Renamed from this...
(grub_vbe_bios_set_palette_data): ... to this.
(grub_vbe_bios_get_controller_info): Fixed problem with registers
getting corrupted after calling it. Added more pushes and pops.
(grub_vbe_bios_set_mode): Likewise.
(grub_vbe_bios_get_mode): Likewise.
(grub_vbe_bios_get_memory_window): Likewise.
(grub_vbe_bios_set_scanline_length): Likewise.
(grub_vbe_bios_get_scanline_length): Likewise.
(grub_vbe_bios_get_display_start): Likewise.
(grub_vbe_bios_set_palette_data): Likewise.
* normal/cmdline.c (cl_set_pos): Refresh the screen.
(cl_insert): Likewise.
(cl_delete): Likewise.
* term/gfxterm.c: New file.
* term/i386/pc/vesafb.c: Removed file.
* video/video.c: New file.
* video/i386/pc/vbe.c (real2pm): Added new function.
(grub_video_vbe_draw_pixel): Likewise.
(grub_video_vbe_get_video_ptr): Likewise.
(grub_video_vbe_get_pixel): Likewise
(grub_video_vbe_init): Likewise.
(grub_video_vbe_fini): Likewise.
(grub_video_vbe_setup): Likewise.
(grub_video_vbe_get_info): Likewise.
(grub_video_vbe_set_palette): Likewise.
(grub_video_vbe_get_palette): Likewise.
(grub_video_vbe_set_viewport): Likewise.
(grub_video_vbe_get_viewport): Likewise.
(grub_video_vbe_map_color): Likewise.
(grub_video_vbe_map_rgb): Likewise.
(grub_video_vbe_map_rgba): Likewise.
(grub_video_vbe_unmap_color): Likewise.
(grub_video_vbe_fill_rect): Likewise.
(grub_video_vbe_blit_glyph): Likewise.
(grub_video_vbe_blit_bitmap): Likewise.
(grub_video_vbe_blit_render_target): Likewise.
(grub_video_vbe_scroll): Likewise.
(grub_video_vbe_swap_buffers): Likewise.
(grub_video_vbe_create_render_target): Likewise.
(grub_video_vbe_delete_render_target): Likewise.
(grub_video_vbe_set_active_render_target): Likewise.
(grub_vbe_set_pixel_rgb): Remove function.
(grub_vbe_set_pixel_index): Likewise.
(index_color_mode): Remove static variable.
(active_mode): Likewise.
(framebuffer): Likewise.
(bytes_per_scan_line): Likewise.
(grub_video_vbe_adapter): Added new static variable.
(framebuffer): Likewise.
(render_target): Likewise.
(initial_mode): Likewise.
(mode_in_use): Likewise.
(mode_list): Likewise.
This commit is contained in:
chaac
parent
5f97350bc7
commit
bd0d7896cf
15 changed files with 3234 additions and 313 deletions
147
ChangeLog
147
ChangeLog
|
|
@ -1,3 +1,150 @@
|
|||
2006-03-14 Vesa Jaaskelainen <chaac@nic.fi>
|
||||
|
||||
* DISTLIST: Added include/grub/video.h, term/gfxterm.c,
|
||||
video/video.c, commands/videotest.c. Removed term/i386/pc/vesafb.c.
|
||||
|
||||
* conf/i386-pc.rmk (pkgdata_MODULES): Added video.mod,
|
||||
gfxterm.mod, videotest.mod. Removed vga.mod, vesafb.mod.
|
||||
(video_mod_SOURCES): Added.
|
||||
(video_mod_CFLAGS): Likewise.
|
||||
(video_mod_LDFLAGS): Likewise.
|
||||
(gfxterm_mod_SOURCES): Likewise.
|
||||
(gfxterm_mod_CFLAGS): Likewise.
|
||||
(gfxterm_mod_LDFLAGS): Likewise.
|
||||
(videotest_mod_SOURCES): Likewise.
|
||||
(videotest_mod_CFLAGS): Likewise.
|
||||
(videotest_mod_LDFLAGS): Likewise.
|
||||
(vesafb_mod_SOURCES): Removed.
|
||||
(vesafb_mod_CFLAGS): Likewise.
|
||||
(vesafb_mod_LDFLAGS): Likewise.
|
||||
(vga_mod_SOURCES): Likewise.
|
||||
(vga_mod_CFLAGS): Likewise.
|
||||
(vga_mod_LDFLAGS): Likewise.
|
||||
|
||||
* commands/videotest.c: New file.
|
||||
|
||||
* font/manager.c (fill_with_default_glyph): Modified to use
|
||||
grub_font_glyph.
|
||||
(grub_font_get_glyph): Likewise.
|
||||
(fontmanager): Renamed from this...
|
||||
(font_manager): ... to this.
|
||||
|
||||
* include/grub/font.h (grub_font_glyph): Added new structure.
|
||||
(grub_font_get_glyph): Modified to use grub_font_glyph.
|
||||
|
||||
* include/grub/misc.h (grub_abs): Added as inline function.
|
||||
|
||||
* include/grub/video.h: New file.
|
||||
|
||||
* include/grub/i386/pc/vbe.h (GRUB_VBE_STATUS_OK): New macro.
|
||||
(GRUB_VBE_MEMORY_MODEL_PACKED_PIXEL): Likewise.
|
||||
(GRUB_VBE_MEMORY_MODEL_DIRECT_COLOR): Likewise.
|
||||
(grub_vbe_get_controller_info): Renamed from this...
|
||||
(grub_vbe_bios_get_controller_info): ... to this.
|
||||
(grub_vbe_get_mode_info): Renamed from this...
|
||||
(grub_vbe_bios_get_mode_info): ... to this.
|
||||
(grub_vbe_set_mode): Renamed from this...
|
||||
(grub_vbe_bios_set_mode): ... to this.
|
||||
(grub_vbe_get_mode): Renamed from this...
|
||||
(grub_vbe_bios_get_mode): ... to this.
|
||||
(grub_vbe_set_memory_window): Renamed from this...
|
||||
(grub_vbe_bios_set_memory_window): ... to this.
|
||||
(grub_vbe_get_memory_window): Renamed from this...
|
||||
(grub_vbe_bios_get_memory_window): ... to this.
|
||||
(grub_vbe_set_scanline_length): Renamed from this...
|
||||
(grub_vbe_set_scanline_length): ... to this.
|
||||
(grub_vbe_get_scanline_length): Renamed from this...
|
||||
(grub_vbe_bios_get_scanline_length): ... to this.
|
||||
(grub_vbe_set_display_start): Renamed from this...
|
||||
(grub_vbe_bios_set_display_start): ... to this.
|
||||
(grub_vbe_get_display_start): Renamed from this...
|
||||
(grub_vbe_bios_get_display_start): ... to this.
|
||||
(grub_vbe_set_palette_data): Renamed from this...
|
||||
(grub_vbe_bios_set_palette_data): ... to this.
|
||||
(grub_vbe_set_pixel_rgb): Removed.
|
||||
(grub_vbe_set_pixel_index): Likewise.
|
||||
|
||||
* kern/i386/pc/startup.S (grub_vbe_get_controller_info): Renamed
|
||||
from this...
|
||||
(grub_vbe_bios_get_controller_info): ... to this.
|
||||
(grub_vbe_get_mode_info): Renamed from this...
|
||||
(grub_vbe_bios_get_mode_info): ... to this.
|
||||
(grub_vbe_set_mode): Renamed from this...
|
||||
(grub_vbe_bios_set_mode): ... to this.
|
||||
(grub_vbe_get_mode): Renamed from this...
|
||||
(grub_vbe_bios_get_mode): ... to this.
|
||||
(grub_vbe_set_memory_window): Renamed from this...
|
||||
(grub_vbe_bios_set_memory_window): ... to this.
|
||||
(grub_vbe_get_memory_window): Renamed from this...
|
||||
(grub_vbe_bios_get_memory_window): ... to this.
|
||||
(grub_vbe_set_scanline_length): Renamed from this...
|
||||
(grub_vbe_set_scanline_length): ... to this.
|
||||
(grub_vbe_get_scanline_length): Renamed from this...
|
||||
(grub_vbe_bios_get_scanline_length): ... to this.
|
||||
(grub_vbe_set_display_start): Renamed from this...
|
||||
(grub_vbe_bios_set_display_start): ... to this.
|
||||
(grub_vbe_get_display_start): Renamed from this...
|
||||
(grub_vbe_bios_get_display_start): ... to this.
|
||||
(grub_vbe_set_palette_data): Renamed from this...
|
||||
(grub_vbe_bios_set_palette_data): ... to this.
|
||||
(grub_vbe_bios_get_controller_info): Fixed problem with registers
|
||||
getting corrupted after calling it. Added more pushes and pops.
|
||||
(grub_vbe_bios_set_mode): Likewise.
|
||||
(grub_vbe_bios_get_mode): Likewise.
|
||||
(grub_vbe_bios_get_memory_window): Likewise.
|
||||
(grub_vbe_bios_set_scanline_length): Likewise.
|
||||
(grub_vbe_bios_get_scanline_length): Likewise.
|
||||
(grub_vbe_bios_get_display_start): Likewise.
|
||||
(grub_vbe_bios_set_palette_data): Likewise.
|
||||
|
||||
* normal/cmdline.c (cl_set_pos): Refresh the screen.
|
||||
(cl_insert): Likewise.
|
||||
(cl_delete): Likewise.
|
||||
|
||||
* term/gfxterm.c: New file.
|
||||
|
||||
* term/i386/pc/vesafb.c: Removed file.
|
||||
|
||||
* video/video.c: New file.
|
||||
|
||||
* video/i386/pc/vbe.c (real2pm): Added new function.
|
||||
(grub_video_vbe_draw_pixel): Likewise.
|
||||
(grub_video_vbe_get_video_ptr): Likewise.
|
||||
(grub_video_vbe_get_pixel): Likewise
|
||||
(grub_video_vbe_init): Likewise.
|
||||
(grub_video_vbe_fini): Likewise.
|
||||
(grub_video_vbe_setup): Likewise.
|
||||
(grub_video_vbe_get_info): Likewise.
|
||||
(grub_video_vbe_set_palette): Likewise.
|
||||
(grub_video_vbe_get_palette): Likewise.
|
||||
(grub_video_vbe_set_viewport): Likewise.
|
||||
(grub_video_vbe_get_viewport): Likewise.
|
||||
(grub_video_vbe_map_color): Likewise.
|
||||
(grub_video_vbe_map_rgb): Likewise.
|
||||
(grub_video_vbe_map_rgba): Likewise.
|
||||
(grub_video_vbe_unmap_color): Likewise.
|
||||
(grub_video_vbe_fill_rect): Likewise.
|
||||
(grub_video_vbe_blit_glyph): Likewise.
|
||||
(grub_video_vbe_blit_bitmap): Likewise.
|
||||
(grub_video_vbe_blit_render_target): Likewise.
|
||||
(grub_video_vbe_scroll): Likewise.
|
||||
(grub_video_vbe_swap_buffers): Likewise.
|
||||
(grub_video_vbe_create_render_target): Likewise.
|
||||
(grub_video_vbe_delete_render_target): Likewise.
|
||||
(grub_video_vbe_set_active_render_target): Likewise.
|
||||
(grub_vbe_set_pixel_rgb): Remove function.
|
||||
(grub_vbe_set_pixel_index): Likewise.
|
||||
(index_color_mode): Remove static variable.
|
||||
(active_mode): Likewise.
|
||||
(framebuffer): Likewise.
|
||||
(bytes_per_scan_line): Likewise.
|
||||
(grub_video_vbe_adapter): Added new static variable.
|
||||
(framebuffer): Likewise.
|
||||
(render_target): Likewise.
|
||||
(initial_mode): Likewise.
|
||||
(mode_in_use): Likewise.
|
||||
(mode_list): Likewise.
|
||||
|
||||
2006-03-10 Marco Gerards <marco@gnu.org>
|
||||
|
||||
* configure.ac (AC_INIT): Bumped to 1.93.
|
||||
|
|
|
|||
4
DISTLIST
4
DISTLIST
|
|
@ -41,6 +41,7 @@ commands/search.c
|
|||
commands/terminal.c
|
||||
commands/test.c
|
||||
commands/timeout.c
|
||||
commands/videotest.c
|
||||
commands/i386/pc/halt.c
|
||||
commands/i386/pc/play.c
|
||||
commands/i386/pc/reboot.c
|
||||
|
|
@ -107,6 +108,7 @@ include/grub/term.h
|
|||
include/grub/terminfo.h
|
||||
include/grub/tparm.h
|
||||
include/grub/types.h
|
||||
include/grub/video.h
|
||||
include/grub/i386/setjmp.h
|
||||
include/grub/i386/types.h
|
||||
include/grub/i386/pc/biosdisk.h
|
||||
|
|
@ -209,6 +211,7 @@ partmap/pc.c
|
|||
partmap/sun.c
|
||||
term/terminfo.c
|
||||
term/tparm.c
|
||||
term/gfxterm.c
|
||||
term/i386/pc/console.c
|
||||
term/i386/pc/serial.c
|
||||
term/i386/pc/vesafb.c
|
||||
|
|
@ -230,4 +233,5 @@ util/i386/pc/grub-setup.c
|
|||
util/i386/pc/misc.c
|
||||
util/powerpc/ieee1275/grub-mkimage.c
|
||||
util/powerpc/ieee1275/misc.c
|
||||
video/video.c
|
||||
video/i386/pc/vbe.c
|
||||
|
|
|
|||
130
commands/videotest.c
Normal file
130
commands/videotest.c
Normal file
|
|
@ -0,0 +1,130 @@
|
|||
/*
|
||||
* GRUB -- GRand Unified Bootloader
|
||||
* Copyright (C) 2006 Free Software Foundation, Inc.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*/
|
||||
|
||||
#include <grub/machine/memory.h>
|
||||
#include <grub/video.h>
|
||||
#include <grub/types.h>
|
||||
#include <grub/dl.h>
|
||||
#include <grub/misc.h>
|
||||
#include <grub/normal.h>
|
||||
#include <grub/arg.h>
|
||||
#include <grub/mm.h>
|
||||
#include <grub/font.h>
|
||||
#include <grub/term.h>
|
||||
|
||||
static grub_err_t
|
||||
grub_cmd_videotest (struct grub_arg_list *state __attribute__ ((unused)),
|
||||
int argc __attribute__ ((unused)),
|
||||
char **args __attribute__ ((unused)))
|
||||
{
|
||||
if (grub_video_setup (1024, 768,
|
||||
GRUB_VIDEO_MODE_TYPE_INDEX_COLOR) != GRUB_ERR_NONE)
|
||||
return grub_errno;
|
||||
|
||||
grub_getkey ();
|
||||
|
||||
grub_video_color_t color;
|
||||
unsigned int x;
|
||||
unsigned int y;
|
||||
unsigned int width;
|
||||
unsigned int height;
|
||||
int i;
|
||||
struct grub_font_glyph glyph;
|
||||
struct grub_video_render_target *text_layer;
|
||||
grub_video_color_t palette[16];
|
||||
|
||||
grub_video_get_viewport (&x, &y, &width, &height);
|
||||
|
||||
grub_video_create_render_target (&text_layer, width, height,
|
||||
GRUB_VIDEO_MODE_TYPE_RGB
|
||||
| GRUB_VIDEO_MODE_TYPE_ALPHA);
|
||||
|
||||
grub_video_set_active_render_target (GRUB_VIDEO_RENDER_TARGET_DISPLAY);
|
||||
|
||||
color = grub_video_map_rgb (0, 0, 0);
|
||||
grub_video_fill_rect (color, 0, 0, width, height);
|
||||
|
||||
color = grub_video_map_rgb (255, 0, 0);
|
||||
grub_video_fill_rect (color, 0, 0, 100, 100);
|
||||
|
||||
color = grub_video_map_rgb (0, 255, 255);
|
||||
grub_video_fill_rect (color, 100, 100, 100, 100);
|
||||
|
||||
grub_font_get_glyph ('*', &glyph);
|
||||
grub_video_blit_glyph (&glyph, color, 200 ,0);
|
||||
|
||||
grub_video_set_viewport (x + 150, y + 150,
|
||||
width - 150 * 2, height - 150 * 2);
|
||||
color = grub_video_map_rgb (77, 33, 77);
|
||||
grub_video_fill_rect (color, 0, 0, width, height);
|
||||
|
||||
grub_video_set_active_render_target (text_layer);
|
||||
|
||||
color = grub_video_map_rgb (255, 255, 255);
|
||||
|
||||
grub_font_get_glyph ('A', &glyph);
|
||||
grub_video_blit_glyph (&glyph, color, 16, 16);
|
||||
grub_font_get_glyph ('B', &glyph);
|
||||
grub_video_blit_glyph (&glyph, color, 16 * 2, 16);
|
||||
|
||||
grub_font_get_glyph ('*', &glyph);
|
||||
|
||||
for (i = 0; i < 16; i++)
|
||||
{
|
||||
color = grub_video_map_color (i);
|
||||
palette[i] = color;
|
||||
grub_video_blit_glyph (&glyph, color, 16 + i * 16, 32);
|
||||
}
|
||||
|
||||
grub_video_set_active_render_target (GRUB_VIDEO_RENDER_TARGET_DISPLAY);
|
||||
|
||||
for (i = 0; i < 255; i++)
|
||||
{
|
||||
color = grub_video_map_rgb (i, 33, 77);
|
||||
grub_video_fill_rect (color, 0, 0, width, height);
|
||||
grub_video_blit_render_target (text_layer, 0, 0, 0, 0, width, height);
|
||||
}
|
||||
|
||||
grub_getkey ();
|
||||
|
||||
grub_video_delete_render_target (text_layer);
|
||||
|
||||
grub_video_restore ();
|
||||
|
||||
for (i = 0; i < 16; i++)
|
||||
grub_printf("color %d: %08x\n", i, palette[i]);
|
||||
|
||||
grub_errno = GRUB_ERR_NONE;
|
||||
return grub_errno;
|
||||
}
|
||||
|
||||
GRUB_MOD_INIT(videotest)
|
||||
{
|
||||
grub_register_command ("videotest",
|
||||
grub_cmd_videotest,
|
||||
GRUB_COMMAND_FLAG_BOTH,
|
||||
"videotest",
|
||||
"Test video subsystem",
|
||||
0);
|
||||
}
|
||||
|
||||
GRUB_MOD_FINI(videotest)
|
||||
{
|
||||
grub_unregister_command ("videotest");
|
||||
}
|
||||
260
conf/i386-pc.mk
260
conf/i386-pc.mk
|
|
@ -1367,9 +1367,10 @@ grub-install: util/i386/pc/grub-install.in config.status
|
|||
|
||||
|
||||
# Modules.
|
||||
pkgdata_MODULES = _chain.mod _linux.mod linux.mod normal.mod vga.mod \
|
||||
pkgdata_MODULES = _chain.mod _linux.mod linux.mod normal.mod \
|
||||
_multiboot.mod chain.mod multiboot.mod reboot.mod halt.mod \
|
||||
vbe.mod vesafb.mod vbetest.mod vbeinfo.mod play.mod
|
||||
vbe.mod vbetest.mod vbeinfo.mod video.mod gfxterm.mod \
|
||||
videotest.mod play.mod
|
||||
|
||||
# For _chain.mod.
|
||||
_chain_mod_SOURCES = loader/i386/pc/chainloader.c
|
||||
|
|
@ -1999,57 +2000,6 @@ fs-halt_mod-commands_i386_pc_halt.lst: commands/i386/pc/halt.c genfslist.sh
|
|||
halt_mod_CFLAGS = $(COMMON_CFLAGS)
|
||||
halt_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
||||
|
||||
# For vga.mod.
|
||||
vga_mod_SOURCES = term/i386/pc/vga.c
|
||||
CLEANFILES += vga.mod mod-vga.o mod-vga.c pre-vga.o vga_mod-term_i386_pc_vga.o def-vga.lst und-vga.lst
|
||||
MOSTLYCLEANFILES += vga_mod-term_i386_pc_vga.d
|
||||
DEFSYMFILES += def-vga.lst
|
||||
UNDSYMFILES += und-vga.lst
|
||||
|
||||
vga.mod: pre-vga.o mod-vga.o
|
||||
-rm -f $@
|
||||
$(LD) $(vga_mod_LDFLAGS) $(LDFLAGS) -r -d -o $@ $^
|
||||
$(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .comment $@
|
||||
|
||||
pre-vga.o: vga_mod-term_i386_pc_vga.o
|
||||
-rm -f $@
|
||||
$(LD) $(vga_mod_LDFLAGS) -r -d -o $@ $^
|
||||
|
||||
mod-vga.o: mod-vga.c
|
||||
$(CC) $(CPPFLAGS) $(CFLAGS) $(vga_mod_CFLAGS) -c -o $@ $<
|
||||
|
||||
mod-vga.c: moddep.lst genmodsrc.sh
|
||||
sh $(srcdir)/genmodsrc.sh 'vga' $< > $@ || (rm -f $@; exit 1)
|
||||
|
||||
def-vga.lst: pre-vga.o
|
||||
$(NM) -g --defined-only -P -p $< | sed 's/^\([^ ]*\).*/\1 vga/' > $@
|
||||
|
||||
und-vga.lst: pre-vga.o
|
||||
echo 'vga' > $@
|
||||
$(NM) -u -P -p $< | cut -f1 -d' ' >> $@
|
||||
|
||||
vga_mod-term_i386_pc_vga.o: term/i386/pc/vga.c
|
||||
$(CC) -Iterm/i386/pc -I$(srcdir)/term/i386/pc $(CPPFLAGS) $(CFLAGS) $(vga_mod_CFLAGS) -c -o $@ $<
|
||||
|
||||
vga_mod-term_i386_pc_vga.d: term/i386/pc/vga.c
|
||||
set -e; $(CC) -Iterm/i386/pc -I$(srcdir)/term/i386/pc $(CPPFLAGS) $(CFLAGS) $(vga_mod_CFLAGS) -M $< | sed 's,vga\.o[ :]*,vga_mod-term_i386_pc_vga.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@
|
||||
|
||||
-include vga_mod-term_i386_pc_vga.d
|
||||
|
||||
CLEANFILES += cmd-vga_mod-term_i386_pc_vga.lst fs-vga_mod-term_i386_pc_vga.lst
|
||||
COMMANDFILES += cmd-vga_mod-term_i386_pc_vga.lst
|
||||
FSFILES += fs-vga_mod-term_i386_pc_vga.lst
|
||||
|
||||
cmd-vga_mod-term_i386_pc_vga.lst: term/i386/pc/vga.c gencmdlist.sh
|
||||
set -e; $(CC) -Iterm/i386/pc -I$(srcdir)/term/i386/pc $(CPPFLAGS) $(CFLAGS) $(vga_mod_CFLAGS) -E $< | sh $(srcdir)/gencmdlist.sh vga > $@ || (rm -f $@; exit 1)
|
||||
|
||||
fs-vga_mod-term_i386_pc_vga.lst: term/i386/pc/vga.c genfslist.sh
|
||||
set -e; $(CC) -Iterm/i386/pc -I$(srcdir)/term/i386/pc $(CPPFLAGS) $(CFLAGS) $(vga_mod_CFLAGS) -E $< | sh $(srcdir)/genfslist.sh vga > $@ || (rm -f $@; exit 1)
|
||||
|
||||
|
||||
vga_mod_CFLAGS = $(COMMON_CFLAGS)
|
||||
vga_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
||||
|
||||
# For serial.mod.
|
||||
serial_mod_SOURCES = term/i386/pc/serial.c
|
||||
serial_mod_CFLAGS = $(COMMON_CFLAGS)
|
||||
|
|
@ -2208,57 +2158,6 @@ fs-vbe_mod-video_i386_pc_vbe.lst: video/i386/pc/vbe.c genfslist.sh
|
|||
vbe_mod_CFLAGS = $(COMMON_CFLAGS)
|
||||
vbe_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
||||
|
||||
# For vesafb.mod.
|
||||
vesafb_mod_SOURCES = term/i386/pc/vesafb.c
|
||||
CLEANFILES += vesafb.mod mod-vesafb.o mod-vesafb.c pre-vesafb.o vesafb_mod-term_i386_pc_vesafb.o def-vesafb.lst und-vesafb.lst
|
||||
MOSTLYCLEANFILES += vesafb_mod-term_i386_pc_vesafb.d
|
||||
DEFSYMFILES += def-vesafb.lst
|
||||
UNDSYMFILES += und-vesafb.lst
|
||||
|
||||
vesafb.mod: pre-vesafb.o mod-vesafb.o
|
||||
-rm -f $@
|
||||
$(LD) $(vesafb_mod_LDFLAGS) $(LDFLAGS) -r -d -o $@ $^
|
||||
$(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .comment $@
|
||||
|
||||
pre-vesafb.o: vesafb_mod-term_i386_pc_vesafb.o
|
||||
-rm -f $@
|
||||
$(LD) $(vesafb_mod_LDFLAGS) -r -d -o $@ $^
|
||||
|
||||
mod-vesafb.o: mod-vesafb.c
|
||||
$(CC) $(CPPFLAGS) $(CFLAGS) $(vesafb_mod_CFLAGS) -c -o $@ $<
|
||||
|
||||
mod-vesafb.c: moddep.lst genmodsrc.sh
|
||||
sh $(srcdir)/genmodsrc.sh 'vesafb' $< > $@ || (rm -f $@; exit 1)
|
||||
|
||||
def-vesafb.lst: pre-vesafb.o
|
||||
$(NM) -g --defined-only -P -p $< | sed 's/^\([^ ]*\).*/\1 vesafb/' > $@
|
||||
|
||||
und-vesafb.lst: pre-vesafb.o
|
||||
echo 'vesafb' > $@
|
||||
$(NM) -u -P -p $< | cut -f1 -d' ' >> $@
|
||||
|
||||
vesafb_mod-term_i386_pc_vesafb.o: term/i386/pc/vesafb.c
|
||||
$(CC) -Iterm/i386/pc -I$(srcdir)/term/i386/pc $(CPPFLAGS) $(CFLAGS) $(vesafb_mod_CFLAGS) -c -o $@ $<
|
||||
|
||||
vesafb_mod-term_i386_pc_vesafb.d: term/i386/pc/vesafb.c
|
||||
set -e; $(CC) -Iterm/i386/pc -I$(srcdir)/term/i386/pc $(CPPFLAGS) $(CFLAGS) $(vesafb_mod_CFLAGS) -M $< | sed 's,vesafb\.o[ :]*,vesafb_mod-term_i386_pc_vesafb.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@
|
||||
|
||||
-include vesafb_mod-term_i386_pc_vesafb.d
|
||||
|
||||
CLEANFILES += cmd-vesafb_mod-term_i386_pc_vesafb.lst fs-vesafb_mod-term_i386_pc_vesafb.lst
|
||||
COMMANDFILES += cmd-vesafb_mod-term_i386_pc_vesafb.lst
|
||||
FSFILES += fs-vesafb_mod-term_i386_pc_vesafb.lst
|
||||
|
||||
cmd-vesafb_mod-term_i386_pc_vesafb.lst: term/i386/pc/vesafb.c gencmdlist.sh
|
||||
set -e; $(CC) -Iterm/i386/pc -I$(srcdir)/term/i386/pc $(CPPFLAGS) $(CFLAGS) $(vesafb_mod_CFLAGS) -E $< | sh $(srcdir)/gencmdlist.sh vesafb > $@ || (rm -f $@; exit 1)
|
||||
|
||||
fs-vesafb_mod-term_i386_pc_vesafb.lst: term/i386/pc/vesafb.c genfslist.sh
|
||||
set -e; $(CC) -Iterm/i386/pc -I$(srcdir)/term/i386/pc $(CPPFLAGS) $(CFLAGS) $(vesafb_mod_CFLAGS) -E $< | sh $(srcdir)/genfslist.sh vesafb > $@ || (rm -f $@; exit 1)
|
||||
|
||||
|
||||
vesafb_mod_CFLAGS = $(COMMON_CFLAGS)
|
||||
vesafb_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
||||
|
||||
# For vbeinfo.mod.
|
||||
vbeinfo_mod_SOURCES = commands/i386/pc/vbeinfo.c
|
||||
CLEANFILES += vbeinfo.mod mod-vbeinfo.o mod-vbeinfo.c pre-vbeinfo.o vbeinfo_mod-commands_i386_pc_vbeinfo.o def-vbeinfo.lst und-vbeinfo.lst
|
||||
|
|
@ -2412,4 +2311,157 @@ fs-play_mod-commands_i386_pc_play.lst: commands/i386/pc/play.c genfslist.sh
|
|||
play_mod_CFLAGS = $(COMMON_CFLAGS)
|
||||
play_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
||||
|
||||
# For video.mod.
|
||||
video_mod_SOURCES = video/video.c
|
||||
CLEANFILES += video.mod mod-video.o mod-video.c pre-video.o video_mod-video_video.o def-video.lst und-video.lst
|
||||
MOSTLYCLEANFILES += video_mod-video_video.d
|
||||
DEFSYMFILES += def-video.lst
|
||||
UNDSYMFILES += und-video.lst
|
||||
|
||||
video.mod: pre-video.o mod-video.o
|
||||
-rm -f $@
|
||||
$(LD) $(video_mod_LDFLAGS) $(LDFLAGS) -r -d -o $@ $^
|
||||
$(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .comment $@
|
||||
|
||||
pre-video.o: video_mod-video_video.o
|
||||
-rm -f $@
|
||||
$(LD) $(video_mod_LDFLAGS) -r -d -o $@ $^
|
||||
|
||||
mod-video.o: mod-video.c
|
||||
$(CC) $(CPPFLAGS) $(CFLAGS) $(video_mod_CFLAGS) -c -o $@ $<
|
||||
|
||||
mod-video.c: moddep.lst genmodsrc.sh
|
||||
sh $(srcdir)/genmodsrc.sh 'video' $< > $@ || (rm -f $@; exit 1)
|
||||
|
||||
def-video.lst: pre-video.o
|
||||
$(NM) -g --defined-only -P -p $< | sed 's/^\([^ ]*\).*/\1 video/' > $@
|
||||
|
||||
und-video.lst: pre-video.o
|
||||
echo 'video' > $@
|
||||
$(NM) -u -P -p $< | cut -f1 -d' ' >> $@
|
||||
|
||||
video_mod-video_video.o: video/video.c
|
||||
$(CC) -Ivideo -I$(srcdir)/video $(CPPFLAGS) $(CFLAGS) $(video_mod_CFLAGS) -c -o $@ $<
|
||||
|
||||
video_mod-video_video.d: video/video.c
|
||||
set -e; $(CC) -Ivideo -I$(srcdir)/video $(CPPFLAGS) $(CFLAGS) $(video_mod_CFLAGS) -M $< | sed 's,video\.o[ :]*,video_mod-video_video.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@
|
||||
|
||||
-include video_mod-video_video.d
|
||||
|
||||
CLEANFILES += cmd-video_mod-video_video.lst fs-video_mod-video_video.lst
|
||||
COMMANDFILES += cmd-video_mod-video_video.lst
|
||||
FSFILES += fs-video_mod-video_video.lst
|
||||
|
||||
cmd-video_mod-video_video.lst: video/video.c gencmdlist.sh
|
||||
set -e; $(CC) -Ivideo -I$(srcdir)/video $(CPPFLAGS) $(CFLAGS) $(video_mod_CFLAGS) -E $< | sh $(srcdir)/gencmdlist.sh video > $@ || (rm -f $@; exit 1)
|
||||
|
||||
fs-video_mod-video_video.lst: video/video.c genfslist.sh
|
||||
set -e; $(CC) -Ivideo -I$(srcdir)/video $(CPPFLAGS) $(CFLAGS) $(video_mod_CFLAGS) -E $< | sh $(srcdir)/genfslist.sh video > $@ || (rm -f $@; exit 1)
|
||||
|
||||
|
||||
video_mod_CFLAGS = $(COMMON_CFLAGS)
|
||||
video_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
||||
|
||||
# For gfxterm.mod.
|
||||
gfxterm_mod_SOURCES = term/gfxterm.c
|
||||
CLEANFILES += gfxterm.mod mod-gfxterm.o mod-gfxterm.c pre-gfxterm.o gfxterm_mod-term_gfxterm.o def-gfxterm.lst und-gfxterm.lst
|
||||
MOSTLYCLEANFILES += gfxterm_mod-term_gfxterm.d
|
||||
DEFSYMFILES += def-gfxterm.lst
|
||||
UNDSYMFILES += und-gfxterm.lst
|
||||
|
||||
gfxterm.mod: pre-gfxterm.o mod-gfxterm.o
|
||||
-rm -f $@
|
||||
$(LD) $(gfxterm_mod_LDFLAGS) $(LDFLAGS) -r -d -o $@ $^
|
||||
$(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .comment $@
|
||||
|
||||
pre-gfxterm.o: gfxterm_mod-term_gfxterm.o
|
||||
-rm -f $@
|
||||
$(LD) $(gfxterm_mod_LDFLAGS) -r -d -o $@ $^
|
||||
|
||||
mod-gfxterm.o: mod-gfxterm.c
|
||||
$(CC) $(CPPFLAGS) $(CFLAGS) $(gfxterm_mod_CFLAGS) -c -o $@ $<
|
||||
|
||||
mod-gfxterm.c: moddep.lst genmodsrc.sh
|
||||
sh $(srcdir)/genmodsrc.sh 'gfxterm' $< > $@ || (rm -f $@; exit 1)
|
||||
|
||||
def-gfxterm.lst: pre-gfxterm.o
|
||||
$(NM) -g --defined-only -P -p $< | sed 's/^\([^ ]*\).*/\1 gfxterm/' > $@
|
||||
|
||||
und-gfxterm.lst: pre-gfxterm.o
|
||||
echo 'gfxterm' > $@
|
||||
$(NM) -u -P -p $< | cut -f1 -d' ' >> $@
|
||||
|
||||
gfxterm_mod-term_gfxterm.o: term/gfxterm.c
|
||||
$(CC) -Iterm -I$(srcdir)/term $(CPPFLAGS) $(CFLAGS) $(gfxterm_mod_CFLAGS) -c -o $@ $<
|
||||
|
||||
gfxterm_mod-term_gfxterm.d: term/gfxterm.c
|
||||
set -e; $(CC) -Iterm -I$(srcdir)/term $(CPPFLAGS) $(CFLAGS) $(gfxterm_mod_CFLAGS) -M $< | sed 's,gfxterm\.o[ :]*,gfxterm_mod-term_gfxterm.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@
|
||||
|
||||
-include gfxterm_mod-term_gfxterm.d
|
||||
|
||||
CLEANFILES += cmd-gfxterm_mod-term_gfxterm.lst fs-gfxterm_mod-term_gfxterm.lst
|
||||
COMMANDFILES += cmd-gfxterm_mod-term_gfxterm.lst
|
||||
FSFILES += fs-gfxterm_mod-term_gfxterm.lst
|
||||
|
||||
cmd-gfxterm_mod-term_gfxterm.lst: term/gfxterm.c gencmdlist.sh
|
||||
set -e; $(CC) -Iterm -I$(srcdir)/term $(CPPFLAGS) $(CFLAGS) $(gfxterm_mod_CFLAGS) -E $< | sh $(srcdir)/gencmdlist.sh gfxterm > $@ || (rm -f $@; exit 1)
|
||||
|
||||
fs-gfxterm_mod-term_gfxterm.lst: term/gfxterm.c genfslist.sh
|
||||
set -e; $(CC) -Iterm -I$(srcdir)/term $(CPPFLAGS) $(CFLAGS) $(gfxterm_mod_CFLAGS) -E $< | sh $(srcdir)/genfslist.sh gfxterm > $@ || (rm -f $@; exit 1)
|
||||
|
||||
|
||||
gfxterm_mod_CFLAGS = $(COMMON_CFLAGS)
|
||||
gfxterm_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
||||
|
||||
# For videotest.mod.
|
||||
videotest_mod_SOURCES = commands/videotest.c
|
||||
CLEANFILES += videotest.mod mod-videotest.o mod-videotest.c pre-videotest.o videotest_mod-commands_videotest.o def-videotest.lst und-videotest.lst
|
||||
MOSTLYCLEANFILES += videotest_mod-commands_videotest.d
|
||||
DEFSYMFILES += def-videotest.lst
|
||||
UNDSYMFILES += und-videotest.lst
|
||||
|
||||
videotest.mod: pre-videotest.o mod-videotest.o
|
||||
-rm -f $@
|
||||
$(LD) $(videotest_mod_LDFLAGS) $(LDFLAGS) -r -d -o $@ $^
|
||||
$(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .comment $@
|
||||
|
||||
pre-videotest.o: videotest_mod-commands_videotest.o
|
||||
-rm -f $@
|
||||
$(LD) $(videotest_mod_LDFLAGS) -r -d -o $@ $^
|
||||
|
||||
mod-videotest.o: mod-videotest.c
|
||||
$(CC) $(CPPFLAGS) $(CFLAGS) $(videotest_mod_CFLAGS) -c -o $@ $<
|
||||
|
||||
mod-videotest.c: moddep.lst genmodsrc.sh
|
||||
sh $(srcdir)/genmodsrc.sh 'videotest' $< > $@ || (rm -f $@; exit 1)
|
||||
|
||||
def-videotest.lst: pre-videotest.o
|
||||
$(NM) -g --defined-only -P -p $< | sed 's/^\([^ ]*\).*/\1 videotest/' > $@
|
||||
|
||||
und-videotest.lst: pre-videotest.o
|
||||
echo 'videotest' > $@
|
||||
$(NM) -u -P -p $< | cut -f1 -d' ' >> $@
|
||||
|
||||
videotest_mod-commands_videotest.o: commands/videotest.c
|
||||
$(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(videotest_mod_CFLAGS) -c -o $@ $<
|
||||
|
||||
videotest_mod-commands_videotest.d: commands/videotest.c
|
||||
set -e; $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(videotest_mod_CFLAGS) -M $< | sed 's,videotest\.o[ :]*,videotest_mod-commands_videotest.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@
|
||||
|
||||
-include videotest_mod-commands_videotest.d
|
||||
|
||||
CLEANFILES += cmd-videotest_mod-commands_videotest.lst fs-videotest_mod-commands_videotest.lst
|
||||
COMMANDFILES += cmd-videotest_mod-commands_videotest.lst
|
||||
FSFILES += fs-videotest_mod-commands_videotest.lst
|
||||
|
||||
cmd-videotest_mod-commands_videotest.lst: commands/videotest.c gencmdlist.sh
|
||||
set -e; $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(videotest_mod_CFLAGS) -E $< | sh $(srcdir)/gencmdlist.sh videotest > $@ || (rm -f $@; exit 1)
|
||||
|
||||
fs-videotest_mod-commands_videotest.lst: commands/videotest.c genfslist.sh
|
||||
set -e; $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(videotest_mod_CFLAGS) -E $< | sh $(srcdir)/genfslist.sh videotest > $@ || (rm -f $@; exit 1)
|
||||
|
||||
|
||||
videotest_mod_CFLAGS = $(COMMON_CFLAGS)
|
||||
videotest_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
||||
|
||||
include $(srcdir)/conf/common.mk
|
||||
|
|
|
|||
|
|
@ -113,9 +113,10 @@ sbin_SCRIPTS = grub-install
|
|||
grub_install_SOURCES = util/i386/pc/grub-install.in
|
||||
|
||||
# Modules.
|
||||
pkgdata_MODULES = _chain.mod _linux.mod linux.mod normal.mod vga.mod \
|
||||
pkgdata_MODULES = _chain.mod _linux.mod linux.mod normal.mod \
|
||||
_multiboot.mod chain.mod multiboot.mod reboot.mod halt.mod \
|
||||
vbe.mod vesafb.mod vbetest.mod vbeinfo.mod play.mod
|
||||
vbe.mod vbetest.mod vbeinfo.mod video.mod gfxterm.mod \
|
||||
videotest.mod play.mod
|
||||
|
||||
# For _chain.mod.
|
||||
_chain_mod_SOURCES = loader/i386/pc/chainloader.c
|
||||
|
|
@ -157,11 +158,6 @@ halt_mod_SOURCES = commands/i386/pc/halt.c
|
|||
halt_mod_CFLAGS = $(COMMON_CFLAGS)
|
||||
halt_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
||||
|
||||
# For vga.mod.
|
||||
vga_mod_SOURCES = term/i386/pc/vga.c
|
||||
vga_mod_CFLAGS = $(COMMON_CFLAGS)
|
||||
vga_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
||||
|
||||
# For serial.mod.
|
||||
serial_mod_SOURCES = term/i386/pc/serial.c
|
||||
serial_mod_CFLAGS = $(COMMON_CFLAGS)
|
||||
|
|
@ -182,11 +178,6 @@ vbe_mod_SOURCES = video/i386/pc/vbe.c
|
|||
vbe_mod_CFLAGS = $(COMMON_CFLAGS)
|
||||
vbe_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
||||
|
||||
# For vesafb.mod.
|
||||
vesafb_mod_SOURCES = term/i386/pc/vesafb.c
|
||||
vesafb_mod_CFLAGS = $(COMMON_CFLAGS)
|
||||
vesafb_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
||||
|
||||
# For vbeinfo.mod.
|
||||
vbeinfo_mod_SOURCES = commands/i386/pc/vbeinfo.c
|
||||
vbeinfo_mod_CFLAGS = $(COMMON_CFLAGS)
|
||||
|
|
@ -202,4 +193,19 @@ play_mod_SOURCES = commands/i386/pc/play.c
|
|||
play_mod_CFLAGS = $(COMMON_CFLAGS)
|
||||
play_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
||||
|
||||
# For video.mod.
|
||||
video_mod_SOURCES = video/video.c
|
||||
video_mod_CFLAGS = $(COMMON_CFLAGS)
|
||||
video_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
||||
|
||||
# For gfxterm.mod.
|
||||
gfxterm_mod_SOURCES = term/gfxterm.c
|
||||
gfxterm_mod_CFLAGS = $(COMMON_CFLAGS)
|
||||
gfxterm_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
||||
|
||||
# For videotest.mod.
|
||||
videotest_mod_SOURCES = commands/videotest.c
|
||||
videotest_mod_CFLAGS = $(COMMON_CFLAGS)
|
||||
videotest_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
||||
|
||||
include $(srcdir)/conf/common.mk
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/*
|
||||
* GRUB -- GRand Unified Bootloader
|
||||
* Copyright (C) 2003,2005 Free Software Foundation, Inc.
|
||||
* Copyright (C) 2003,2005,2006 Free Software Foundation, Inc.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
|
@ -151,26 +151,27 @@ find_glyph (const struct font *font, grub_uint32_t code)
|
|||
|
||||
/* Set the glyph to something stupid. */
|
||||
static void
|
||||
fill_with_default_glyph (unsigned char bitmap[32], unsigned *width)
|
||||
fill_with_default_glyph (grub_font_glyph_t glyph)
|
||||
{
|
||||
if (bitmap)
|
||||
{
|
||||
unsigned i;
|
||||
|
||||
for (i = 0; i < 16; i++)
|
||||
bitmap[i] = (i & 1) ? 0x55 : 0xaa;
|
||||
}
|
||||
glyph->bitmap[i] = (i & 1) ? 0x55 : 0xaa;
|
||||
|
||||
*width = 1;
|
||||
glyph->char_width = 1;
|
||||
glyph->width = glyph->char_width * 8;
|
||||
glyph->height = 16;
|
||||
glyph->baseline = (16 * 3) / 4;
|
||||
}
|
||||
|
||||
/* Get a glyph corresponding to the codepoint CODE. Always fill BITMAP
|
||||
and WIDTH with something, even if no glyph is found. */
|
||||
/* Get a glyph corresponding to the codepoint CODE. Always fill glyph
|
||||
information with something, even if no glyph is found. */
|
||||
int
|
||||
grub_font_get_glyph (grub_uint32_t code,
|
||||
unsigned char bitmap[32], unsigned *width)
|
||||
grub_font_glyph_t glyph)
|
||||
{
|
||||
struct font *font;
|
||||
grub_uint8_t bitmap[32];
|
||||
|
||||
/* FIXME: It is necessary to cache glyphs! */
|
||||
|
||||
|
|
@ -183,9 +184,17 @@ grub_font_get_glyph (grub_uint32_t code,
|
|||
if (offset)
|
||||
{
|
||||
grub_uint32_t w;
|
||||
unsigned int x;
|
||||
unsigned int y;
|
||||
int len;
|
||||
|
||||
/* Make sure we can find glyphs for error messages. Push active
|
||||
error message to error stack and reset error message. */
|
||||
grub_error_push ();
|
||||
|
||||
grub_file_seek (font->file, offset);
|
||||
if (grub_file_read (font->file, (char *) &w, 4) != 4)
|
||||
if ((len = grub_file_read (font->file, (char *) &w, sizeof (w)))
|
||||
!= sizeof (w))
|
||||
{
|
||||
remove_font (font);
|
||||
goto restart;
|
||||
|
|
@ -207,13 +216,25 @@ grub_font_get_glyph (grub_uint32_t code,
|
|||
goto restart;
|
||||
}
|
||||
|
||||
*width = w;
|
||||
/* Temporary workaround, fix font bitmap. */
|
||||
for (y = 0; y < 16; y++)
|
||||
for (x = 0; x < w; x++)
|
||||
glyph->bitmap[y * w + x] = bitmap[x * 16 + y];
|
||||
|
||||
glyph->char_width = w;
|
||||
glyph->width = glyph->char_width * 8;
|
||||
glyph->height = 16;
|
||||
glyph->baseline = (16 * 3) / 4;
|
||||
|
||||
/* Restore old error message. */
|
||||
grub_error_pop ();
|
||||
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
||||
/* Uggh... No font was found. */
|
||||
fill_with_default_glyph (bitmap, width);
|
||||
fill_with_default_glyph (glyph);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -232,15 +253,14 @@ font_command (struct grub_arg_list *state __attribute__ ((unused)),
|
|||
return 0;
|
||||
}
|
||||
|
||||
GRUB_MOD_INIT(fontmanager)
|
||||
GRUB_MOD_INIT(font_manager)
|
||||
{
|
||||
(void) mod; /* Stop warning. */
|
||||
grub_register_command ("font", font_command, GRUB_COMMAND_FLAG_BOTH,
|
||||
"font FILE...",
|
||||
"Specify one or more font files to display.", 0);
|
||||
}
|
||||
|
||||
GRUB_MOD_FINI(fontmanager)
|
||||
GRUB_MOD_FINI(font_manager)
|
||||
{
|
||||
grub_unregister_command ("font");
|
||||
}
|
||||
|
|
|
|||
|
|
@ -24,7 +24,31 @@
|
|||
|
||||
#define GRUB_FONT_MAGIC "PPF\x7f"
|
||||
|
||||
struct grub_font_glyph
|
||||
{
|
||||
/* Glyph width in pixels. */
|
||||
grub_uint8_t width;
|
||||
|
||||
/* Glyph height in pixels. */
|
||||
grub_uint8_t height;
|
||||
|
||||
/* Glyph width in characters. */
|
||||
grub_uint8_t char_width;
|
||||
|
||||
/* Glyph baseline position in pixels (from up). */
|
||||
grub_uint8_t baseline;
|
||||
|
||||
/* Glyph bitmap data array of bytes in ((width + 7) / 8) * height.
|
||||
Bitmap is formulated by height scanlines, each scanline having
|
||||
width number of pixels. Pixels are coded as bits, value 1 meaning
|
||||
of opaque pixel and 0 is transparent. If width does not fit byte
|
||||
boundary, it will be padded with 0 to make it fit. */
|
||||
grub_uint8_t bitmap[32];
|
||||
};
|
||||
|
||||
typedef struct grub_font_glyph *grub_font_glyph_t;
|
||||
|
||||
int grub_font_get_glyph (grub_uint32_t code,
|
||||
unsigned char bitmap[32], unsigned *width);
|
||||
grub_font_glyph_t glyph);
|
||||
|
||||
#endif /* ! GRUB_FONT_HEADER */
|
||||
|
|
|
|||
|
|
@ -27,6 +27,13 @@
|
|||
/* Default video mode to be used. */
|
||||
#define GRUB_VBE_DEFAULT_VIDEO_MODE 0x101
|
||||
|
||||
/* VBE status codes. */
|
||||
#define GRUB_VBE_STATUS_OK 0x004f
|
||||
|
||||
/* VBE memory model types. */
|
||||
#define GRUB_VBE_MEMORY_MODEL_PACKED_PIXEL 0x04
|
||||
#define GRUB_VBE_MEMORY_MODEL_DIRECT_COLOR 0x06
|
||||
|
||||
/* Note:
|
||||
|
||||
Please refer to VESA BIOS Extension 3.0 Specification for more descriptive
|
||||
|
|
@ -147,43 +154,43 @@ struct grub_vbe_palette_data
|
|||
/* Prototypes for kernel real mode thunks. */
|
||||
|
||||
/* Call VESA BIOS 0x4f00 to get VBE Controller Information, return status. */
|
||||
grub_vbe_status_t EXPORT_FUNC(grub_vbe_get_controller_info) (struct grub_vbe_info_block *controller_info);
|
||||
grub_vbe_status_t EXPORT_FUNC(grub_vbe_bios_get_controller_info) (struct grub_vbe_info_block *controller_info);
|
||||
|
||||
/* Call VESA BIOS 0x4f01 to get VBE Mode Information, return status. */
|
||||
grub_vbe_status_t EXPORT_FUNC(grub_vbe_get_mode_info) (grub_uint32_t mode,
|
||||
grub_vbe_status_t EXPORT_FUNC(grub_vbe_bios_get_mode_info) (grub_uint32_t mode,
|
||||
struct grub_vbe_mode_info_block *mode_info);
|
||||
|
||||
/* Call VESA BIOS 0x4f02 to set video mode, return status. */
|
||||
grub_vbe_status_t EXPORT_FUNC(grub_vbe_set_mode) (grub_uint32_t mode,
|
||||
grub_vbe_status_t EXPORT_FUNC(grub_vbe_bios_set_mode) (grub_uint32_t mode,
|
||||
struct grub_vbe_crtc_info_block *crtc_info);
|
||||
|
||||
/* Call VESA BIOS 0x4f03 to return current VBE Mode, return status. */
|
||||
grub_vbe_status_t EXPORT_FUNC(grub_vbe_get_mode) (grub_uint32_t *mode);
|
||||
grub_vbe_status_t EXPORT_FUNC(grub_vbe_bios_get_mode) (grub_uint32_t *mode);
|
||||
|
||||
/* Call VESA BIOS 0x4f05 to set memory window, return status. */
|
||||
grub_vbe_status_t EXPORT_FUNC(grub_vbe_set_memory_window) (grub_uint32_t window,
|
||||
grub_vbe_status_t EXPORT_FUNC(grub_vbe_bios_set_memory_window) (grub_uint32_t window,
|
||||
grub_uint32_t position);
|
||||
|
||||
/* Call VESA BIOS 0x4f05 to return memory window, return status. */
|
||||
grub_vbe_status_t EXPORT_FUNC(grub_vbe_get_memory_window) (grub_uint32_t window,
|
||||
grub_vbe_status_t EXPORT_FUNC(grub_vbe_bios_get_memory_window) (grub_uint32_t window,
|
||||
grub_uint32_t *position);
|
||||
|
||||
/* Call VESA BIOS 0x4f06 to set scanline length (in bytes), return status. */
|
||||
grub_vbe_status_t EXPORT_FUNC(grub_vbe_set_scanline_length) (grub_uint32_t length);
|
||||
grub_vbe_status_t EXPORT_FUNC(grub_vbe_bios_set_scanline_length) (grub_uint32_t length);
|
||||
|
||||
/* Call VESA BIOS 0x4f06 to return scanline length (in bytes), return status. */
|
||||
grub_vbe_status_t EXPORT_FUNC(grub_vbe_get_scanline_length) (grub_uint32_t *length);
|
||||
grub_vbe_status_t EXPORT_FUNC(grub_vbe_bios_get_scanline_length) (grub_uint32_t *length);
|
||||
|
||||
/* Call VESA BIOS 0x4f07 to set display start, return status. */
|
||||
grub_vbe_status_t EXPORT_FUNC(grub_vbe_set_display_start) (grub_uint32_t x,
|
||||
grub_vbe_status_t EXPORT_FUNC(grub_vbe_bios_set_display_start) (grub_uint32_t x,
|
||||
grub_uint32_t y);
|
||||
|
||||
/* Call VESA BIOS 0x4f07 to get display start, return status. */
|
||||
grub_vbe_status_t EXPORT_FUNC(grub_vbe_get_display_start) (grub_uint32_t *x,
|
||||
grub_vbe_status_t EXPORT_FUNC(grub_vbe_bios_get_display_start) (grub_uint32_t *x,
|
||||
grub_uint32_t *y);
|
||||
|
||||
/* Call VESA BIOS 0x4f09 to set palette data, return status. */
|
||||
grub_vbe_status_t EXPORT_FUNC(grub_vbe_set_palette_data) (grub_uint32_t color_count,
|
||||
grub_vbe_status_t EXPORT_FUNC(grub_vbe_bios_set_palette_data) (grub_uint32_t color_count,
|
||||
grub_uint32_t start_index,
|
||||
struct grub_vbe_palette_data *palette_data);
|
||||
|
||||
|
|
@ -195,13 +202,5 @@ grub_err_t grub_vbe_set_video_mode (grub_uint32_t mode,
|
|||
grub_err_t grub_vbe_get_video_mode (grub_uint32_t *mode);
|
||||
grub_err_t grub_vbe_get_video_mode_info (grub_uint32_t mode,
|
||||
struct grub_vbe_mode_info_block *mode_info);
|
||||
void grub_vbe_set_pixel_rgb (grub_uint32_t x,
|
||||
grub_uint32_t y,
|
||||
grub_uint8_t red,
|
||||
grub_uint8_t green,
|
||||
grub_uint8_t blue);
|
||||
void grub_vbe_set_pixel_index (grub_uint32_t x,
|
||||
grub_uint32_t y,
|
||||
grub_uint8_t color);
|
||||
|
||||
#endif /* ! GRUB_VBE_MACHINE_HEADER */
|
||||
|
|
|
|||
|
|
@ -76,4 +76,14 @@ grub_ssize_t EXPORT_FUNC(grub_utf8_to_ucs4) (grub_uint32_t *dest,
|
|||
const grub_uint8_t *src,
|
||||
grub_size_t size);
|
||||
|
||||
/* Inline functions. */
|
||||
static inline unsigned int
|
||||
grub_abs (int x)
|
||||
{
|
||||
if (x < 0)
|
||||
return (unsigned int)(-x);
|
||||
else
|
||||
return (unsigned int)x;
|
||||
}
|
||||
|
||||
#endif /* ! GRUB_MISC_HEADER */
|
||||
|
|
|
|||
309
include/grub/video.h
Normal file
309
include/grub/video.h
Normal file
|
|
@ -0,0 +1,309 @@
|
|||
/*
|
||||
* GRUB -- GRand Unified Bootloader
|
||||
* Copyright (C) 2006 Free Software Foundation, Inc.
|
||||
*
|
||||
* GRUB is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with GRUB; if not, write to the Free Software
|
||||
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*/
|
||||
|
||||
#ifndef GRUB_VIDEO_HEADER
|
||||
#define GRUB_VIDEO_HEADER 1
|
||||
|
||||
#include <grub/err.h>
|
||||
#include <grub/symbol.h>
|
||||
#include <grub/types.h>
|
||||
|
||||
typedef grub_uint32_t grub_video_color_t;
|
||||
|
||||
struct grub_video_render_target;
|
||||
|
||||
/* Defines used to describe video mode or rendering target. */
|
||||
#define GRUB_VIDEO_MODE_TYPE_ALPHA 0x00000008
|
||||
#define GRUB_VIDEO_MODE_TYPE_DOUBLE_BUFFERED 0x00000004
|
||||
#define GRUB_VIDEO_MODE_TYPE_INDEX_COLOR 0x00000002
|
||||
#define GRUB_VIDEO_MODE_TYPE_RGB 0x00000001
|
||||
|
||||
/* Defines used to mask flags. */
|
||||
#define GRUB_VIDEO_MODE_TYPE_COLOR_MASK 0x00000003
|
||||
|
||||
/* Defines used to specify requested bit depth. */
|
||||
#define GRUB_VIDEO_MODE_TYPE_DEPTH_MASK 0x0000ff00
|
||||
#define GRUB_VIDEO_MODE_TYPE_DEPTH_POS 8
|
||||
|
||||
/* Defined predefined render targets. */
|
||||
#define GRUB_VIDEO_RENDER_TARGET_DISPLAY ((struct grub_video_render_target *) 0)
|
||||
#define GRUB_VIDEO_RENDER_TARGET_FRONT_BUFFER ((struct grub_video_render_target *) 0)
|
||||
#define GRUB_VIDEO_RENDER_TARGET_BACK_BUFFER ((struct grub_video_render_target *) 1)
|
||||
|
||||
struct grub_video_mode_info
|
||||
{
|
||||
/* Width of the screen. */
|
||||
unsigned int width;
|
||||
|
||||
/* Height of the screen. */
|
||||
unsigned int height;
|
||||
|
||||
/* Mode type bitmask. Contains information like is it Index color or
|
||||
RGB mode. */
|
||||
unsigned int mode_type;
|
||||
|
||||
/* Bits per pixel. */
|
||||
unsigned int bpp;
|
||||
|
||||
/* Bytes per pixel. */
|
||||
unsigned int bytes_per_pixel;
|
||||
|
||||
/* Pitch of one scanline. How many bytes there are for scanline. */
|
||||
unsigned int pitch;
|
||||
|
||||
/* In index color mode, number of colors. In RGB mode this is 256. */
|
||||
unsigned int number_of_colors;
|
||||
|
||||
/* How many bits are reserved for red color. */
|
||||
unsigned int red_mask_size;
|
||||
|
||||
/* What is location of red color bits. In Index Color mode, this is 0. */
|
||||
unsigned int red_field_pos;
|
||||
|
||||
/* How many bits are reserved for green color. */
|
||||
unsigned int green_mask_size;
|
||||
|
||||
/* What is location of green color bits. In Index Color mode, this is 0. */
|
||||
unsigned int green_field_pos;
|
||||
|
||||
/* How many bits are reserved for blue color. */
|
||||
unsigned int blue_mask_size;
|
||||
|
||||
/* What is location of blue color bits. In Index Color mode, this is 0. */
|
||||
unsigned int blue_field_pos;
|
||||
|
||||
/* How many bits are reserved in color. */
|
||||
unsigned int reserved_mask_size;
|
||||
|
||||
/* What is location of reserved color bits. In Index Color mode,
|
||||
this is 0. */
|
||||
unsigned int reserved_field_pos;
|
||||
};
|
||||
|
||||
struct grub_video_render_target
|
||||
{
|
||||
/* Copy of the screen's mode info structure, except that width, height and
|
||||
mode_type has been re-adjusted to requested render target settings. */
|
||||
struct grub_video_mode_info mode_info;
|
||||
|
||||
struct
|
||||
{
|
||||
unsigned int x;
|
||||
unsigned int y;
|
||||
unsigned int width;
|
||||
unsigned int height;
|
||||
} viewport;
|
||||
|
||||
/* Indicates wether the data has been allocated by us and must be freed
|
||||
when render target is destroyed. */
|
||||
int is_allocated;
|
||||
|
||||
/* Pointer to data. Can either be in video card memory or in local host's
|
||||
memory. */
|
||||
void *data;
|
||||
};
|
||||
|
||||
struct grub_video_palette_data
|
||||
{
|
||||
grub_uint8_t r; /* Red color value (0-255). */
|
||||
grub_uint8_t g; /* Green color value (0-255). */
|
||||
grub_uint8_t b; /* Blue color value (0-255). */
|
||||
grub_uint8_t a; /* Reserved bits value (0-255). */
|
||||
};
|
||||
|
||||
struct grub_font_glyph;
|
||||
struct grub_video_bitmap;
|
||||
|
||||
struct grub_video_adapter
|
||||
{
|
||||
/* The video adapter name. */
|
||||
const char *name;
|
||||
|
||||
/* Initialize the video adapter. */
|
||||
grub_err_t (*init) (void);
|
||||
|
||||
/* Clean up the video adapter. */
|
||||
grub_err_t (*fini) (void);
|
||||
|
||||
grub_err_t (*setup) (unsigned int width,
|
||||
unsigned int height,
|
||||
unsigned int mode_type);
|
||||
|
||||
grub_err_t (*get_info) (struct grub_video_mode_info *mode_info);
|
||||
|
||||
grub_err_t (*set_palette) (unsigned int start,
|
||||
unsigned int count,
|
||||
struct grub_video_palette_data *palette_data);
|
||||
|
||||
grub_err_t (*get_palette) (unsigned int start,
|
||||
unsigned int count,
|
||||
struct grub_video_palette_data *palette_data);
|
||||
|
||||
grub_err_t (*set_viewport) (unsigned int x,
|
||||
unsigned int y,
|
||||
unsigned int width,
|
||||
unsigned int height);
|
||||
|
||||
grub_err_t (*get_viewport) (unsigned int *x,
|
||||
unsigned int *y,
|
||||
unsigned int *width,
|
||||
unsigned int *height);
|
||||
|
||||
grub_video_color_t (*map_color) (grub_uint32_t color_name);
|
||||
|
||||
grub_video_color_t (*map_rgb) (grub_uint8_t red,
|
||||
grub_uint8_t green,
|
||||
grub_uint8_t blue);
|
||||
|
||||
grub_video_color_t (*map_rgba) (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,
|
||||
unsigned int width,
|
||||
unsigned int height);
|
||||
|
||||
grub_err_t (*blit_glyph) (struct grub_font_glyph *glyph,
|
||||
grub_video_color_t color,
|
||||
int x,
|
||||
int y);
|
||||
|
||||
grub_err_t (*blit_bitmap) (struct grub_video_bitmap *bitmap,
|
||||
int x,
|
||||
int y,
|
||||
int offset_x,
|
||||
int offset_y,
|
||||
unsigned int width,
|
||||
unsigned int height);
|
||||
|
||||
grub_err_t (*blit_render_target) (struct grub_video_render_target *source,
|
||||
int x,
|
||||
int y,
|
||||
int offset_x,
|
||||
int offset_y,
|
||||
unsigned int width,
|
||||
unsigned int height);
|
||||
|
||||
grub_err_t (*scroll) (grub_video_color_t color,
|
||||
int dx,
|
||||
int dy);
|
||||
|
||||
grub_err_t (*swap_buffers) (void);
|
||||
|
||||
grub_err_t (*create_render_target) (struct grub_video_render_target **result,
|
||||
unsigned int width,
|
||||
unsigned int height,
|
||||
unsigned int mode_type);
|
||||
|
||||
grub_err_t (*delete_render_target) (struct grub_video_render_target *target);
|
||||
|
||||
grub_err_t (*set_active_render_target) (struct grub_video_render_target *target);
|
||||
|
||||
/* The next video adapter. */
|
||||
struct grub_video_adapter *next;
|
||||
};
|
||||
typedef struct grub_video_adapter *grub_video_adapter_t;
|
||||
|
||||
void EXPORT_FUNC(grub_video_register) (grub_video_adapter_t adapter);
|
||||
void EXPORT_FUNC(grub_video_unregister) (grub_video_adapter_t adapter);
|
||||
void EXPORT_FUNC(grub_video_iterate) (int (*hook) (grub_video_adapter_t adapter));
|
||||
|
||||
grub_err_t EXPORT_FUNC(grub_video_setup) (unsigned int width,
|
||||
unsigned int height,
|
||||
unsigned int mode_type);
|
||||
|
||||
grub_err_t EXPORT_FUNC(grub_video_restore) (void);
|
||||
|
||||
grub_err_t EXPORT_FUNC(grub_video_get_info) (struct grub_video_mode_info *mode_info);
|
||||
|
||||
grub_err_t EXPORT_FUNC(grub_video_set_palette) (unsigned int start,
|
||||
unsigned int count,
|
||||
struct grub_video_palette_data *palette_data);
|
||||
|
||||
grub_err_t EXPORT_FUNC(grub_video_get_palette) (unsigned int start,
|
||||
unsigned int count,
|
||||
struct grub_video_palette_data *palette_data);
|
||||
|
||||
grub_err_t EXPORT_FUNC(grub_video_set_viewport) (unsigned int x,
|
||||
unsigned int y,
|
||||
unsigned int width,
|
||||
unsigned int height);
|
||||
|
||||
grub_err_t EXPORT_FUNC(grub_video_get_viewport) (unsigned int *x,
|
||||
unsigned int *y,
|
||||
unsigned int *width,
|
||||
unsigned int *height);
|
||||
|
||||
grub_video_color_t EXPORT_FUNC(grub_video_map_color) (grub_uint32_t color_name);
|
||||
|
||||
grub_video_color_t EXPORT_FUNC(grub_video_map_rgb) (grub_uint8_t red,
|
||||
grub_uint8_t green,
|
||||
grub_uint8_t blue);
|
||||
|
||||
grub_video_color_t EXPORT_FUNC(grub_video_map_rgba) (grub_uint8_t red,
|
||||
grub_uint8_t green,
|
||||
grub_uint8_t blue,
|
||||
grub_uint8_t alpha);
|
||||
|
||||
grub_err_t EXPORT_FUNC(grub_video_fill_rect) (grub_video_color_t color,
|
||||
int x,
|
||||
int y,
|
||||
unsigned int width,
|
||||
unsigned int height);
|
||||
|
||||
grub_err_t EXPORT_FUNC(grub_video_blit_glyph) (struct grub_font_glyph *glyph,
|
||||
grub_video_color_t color,
|
||||
int x,
|
||||
int y);
|
||||
|
||||
grub_err_t EXPORT_FUNC(grub_video_blit_bitmap) (struct grub_video_bitmap *bitmap,
|
||||
int x,
|
||||
int y,
|
||||
int offset_x,
|
||||
int offset_y,
|
||||
unsigned int width,
|
||||
unsigned int height);
|
||||
|
||||
grub_err_t EXPORT_FUNC(grub_video_blit_render_target) (struct grub_video_render_target *source,
|
||||
int x,
|
||||
int y,
|
||||
int offset_x,
|
||||
int offset_y,
|
||||
unsigned int width,
|
||||
unsigned int height);
|
||||
|
||||
grub_err_t EXPORT_FUNC(grub_video_scroll) (grub_video_color_t color,
|
||||
int dx,
|
||||
int dy);
|
||||
|
||||
grub_err_t EXPORT_FUNC(grub_video_swap_buffers) (void);
|
||||
|
||||
grub_err_t EXPORT_FUNC(grub_video_create_render_target) (struct grub_video_render_target **result,
|
||||
unsigned int width,
|
||||
unsigned int height,
|
||||
unsigned int mode_type);
|
||||
|
||||
grub_err_t EXPORT_FUNC(grub_video_delete_render_target) (struct grub_video_render_target *target);
|
||||
|
||||
grub_err_t EXPORT_FUNC(grub_video_set_active_render_target) (struct grub_video_render_target *target);
|
||||
|
||||
#endif /* ! GRUB_VIDEO_HEADER */
|
||||
|
|
@ -1758,14 +1758,15 @@ FUNCTION(grub_vga_get_font)
|
|||
ret
|
||||
|
||||
/*
|
||||
* grub_vbe_status_t grub_vbe_get_controller_info (struct grub_vbe_info_block *controller_info)
|
||||
* grub_vbe_bios_status_t grub_vbe_get_controller_info (struct grub_vbe_info_block *controller_info)
|
||||
*
|
||||
* Register allocations for parameters:
|
||||
* %eax *controller_info
|
||||
*/
|
||||
FUNCTION(grub_vbe_get_controller_info)
|
||||
FUNCTION(grub_vbe_bios_get_controller_info)
|
||||
pushl %ebp
|
||||
pushl %edi
|
||||
pushl %edx
|
||||
|
||||
movw %ax, %di /* Store *controller_info to %edx:%di. */
|
||||
xorw %ax, %ax
|
||||
|
|
@ -1791,19 +1792,20 @@ FUNCTION(grub_vbe_get_controller_info)
|
|||
movl %edx, %eax
|
||||
andl $0x0FFFF, %eax /* Return value in %eax. */
|
||||
|
||||
pop %edx
|
||||
popl %edi
|
||||
popl %ebp
|
||||
ret
|
||||
|
||||
/*
|
||||
* grub_vbe_status_t grub_vbe_get_mode_info (grub_uint32_t mode,
|
||||
* grub_vbe_status_t grub_vbe_bios_get_mode_info (grub_uint32_t mode,
|
||||
* struct grub_vbe_mode_info_block *mode_info)
|
||||
*
|
||||
* Register allocations for parameters:
|
||||
* %eax mode
|
||||
* %edx *mode_info
|
||||
*/
|
||||
FUNCTION(grub_vbe_get_mode_info)
|
||||
FUNCTION(grub_vbe_bios_get_mode_info)
|
||||
pushl %ebp
|
||||
pushl %edi
|
||||
|
||||
|
|
@ -1837,16 +1839,17 @@ FUNCTION(grub_vbe_get_mode_info)
|
|||
ret
|
||||
|
||||
/*
|
||||
* grub_vbe_status_t grub_vbe_set_mode (grub_uint32_t mode,
|
||||
* grub_vbe_status_t grub_vbe_bios_set_mode (grub_uint32_t mode,
|
||||
* struct grub_vbe_crtc_info_block *crtc_info)
|
||||
*
|
||||
* Register allocations for parameters:
|
||||
* %eax mode
|
||||
* %edx *crtc_info
|
||||
*/
|
||||
FUNCTION(grub_vbe_set_mode)
|
||||
FUNCTION(grub_vbe_bios_set_mode)
|
||||
pushl %ebp
|
||||
pushl %ebx
|
||||
pushl %edi
|
||||
|
||||
movl %eax, %ebx /* Store mode in %ebx. */
|
||||
|
||||
|
|
@ -1874,19 +1877,22 @@ FUNCTION(grub_vbe_set_mode)
|
|||
movw %dx, %ax
|
||||
andl $0xFFFF, %eax /* Return value in %eax. */
|
||||
|
||||
popl %edi
|
||||
popl %ebx
|
||||
popl %ebp
|
||||
ret
|
||||
|
||||
/*
|
||||
* grub_vbe_status_t grub_vbe_get_mode (grub_uint32_t *mode)
|
||||
* grub_vbe_status_t grub_vbe_bios_get_mode (grub_uint32_t *mode)
|
||||
*
|
||||
* Register allocations for parameters:
|
||||
* %eax *mode
|
||||
*/
|
||||
FUNCTION(grub_vbe_get_mode)
|
||||
FUNCTION(grub_vbe_bios_get_mode)
|
||||
pushl %ebp
|
||||
pushl %ebx
|
||||
pushl %edi
|
||||
pushl %edx
|
||||
pushl %eax /* Push *mode to stack. */
|
||||
|
||||
call prot_to_real
|
||||
|
|
@ -1907,19 +1913,21 @@ FUNCTION(grub_vbe_get_mode)
|
|||
movw %dx, %ax
|
||||
andl $0xFFFF, %eax /* Return value in %eax. */
|
||||
|
||||
popl %edx
|
||||
popl %edi
|
||||
popl %ebx
|
||||
popl %ebp
|
||||
ret
|
||||
|
||||
/*
|
||||
* grub_vbe_status_t grub_vbe_set_memory_window (grub_uint32_t window,
|
||||
* grub_vbe_status_t grub_vbe_bios_set_memory_window (grub_uint32_t window,
|
||||
* grub_uint32_t position);
|
||||
*
|
||||
* Register allocations for parameters:
|
||||
* %eax window
|
||||
* %edx position
|
||||
*/
|
||||
FUNCTION(grub_vbe_set_memory_window)
|
||||
FUNCTION(grub_vbe_bios_set_memory_window)
|
||||
pushl %ebp
|
||||
pushl %ebx
|
||||
|
||||
|
|
@ -1945,16 +1953,17 @@ FUNCTION(grub_vbe_set_memory_window)
|
|||
ret
|
||||
|
||||
/*
|
||||
* grub_vbe_status_t grub_vbe_get_memory_window (grub_uint32_t window,
|
||||
* grub_vbe_status_t grub_vbe_bios_get_memory_window (grub_uint32_t window,
|
||||
* grub_uint32_t *position);
|
||||
*
|
||||
* Register allocations for parameters:
|
||||
* %eax window
|
||||
* %edx *position
|
||||
*/
|
||||
FUNCTION(grub_vbe_get_memory_window)
|
||||
FUNCTION(grub_vbe_bios_get_memory_window)
|
||||
pushl %ebp
|
||||
pushl %ebx
|
||||
pushl %edi
|
||||
pushl %edx /* Push *position to stack. */
|
||||
|
||||
movl %eax, %ebx /* Store window in %ebx. */
|
||||
|
|
@ -1979,19 +1988,21 @@ FUNCTION(grub_vbe_get_memory_window)
|
|||
movw %bx, %ax
|
||||
andl $0xFFFF, %eax /* Return value in %eax. */
|
||||
|
||||
popl %edi
|
||||
popl %ebx
|
||||
popl %ebp
|
||||
ret
|
||||
|
||||
/*
|
||||
* grub_vbe_status_t grub_vbe_set_scanline_length (grub_uint32_t length)
|
||||
* grub_vbe_status_t grub_vbe_bios_set_scanline_length (grub_uint32_t length)
|
||||
*
|
||||
* Register allocations for parameters:
|
||||
* %eax length
|
||||
*/
|
||||
FUNCTION(grub_vbe_set_scanline_length)
|
||||
FUNCTION(grub_vbe_bios_set_scanline_length)
|
||||
pushl %ebp
|
||||
pushl %ebx
|
||||
pushl %edx
|
||||
|
||||
movl %eax, %ecx /* Store length in %ecx. */
|
||||
|
||||
|
|
@ -2010,19 +2021,21 @@ FUNCTION(grub_vbe_set_scanline_length)
|
|||
movw %dx, %ax
|
||||
andl $0xFFFF, %eax /* Return value in %eax. */
|
||||
|
||||
popl %edx
|
||||
popl %ebx
|
||||
popl %ebp
|
||||
ret
|
||||
|
||||
/*
|
||||
* grub_vbe_status_t grub_vbe_get_scanline_length (grub_uint32_t *length)
|
||||
* grub_vbe_status_t grub_vbe_bios_get_scanline_length (grub_uint32_t *length)
|
||||
*
|
||||
* Register allocations for parameters:
|
||||
* %eax *length
|
||||
*/
|
||||
FUNCTION(grub_vbe_get_scanline_length)
|
||||
FUNCTION(grub_vbe_bios_get_scanline_length)
|
||||
pushl %ebp
|
||||
pushl %ebx
|
||||
pushl %edi
|
||||
pushl %edx /* Push *length to stack. */
|
||||
|
||||
call prot_to_real
|
||||
|
|
@ -2044,19 +2057,20 @@ FUNCTION(grub_vbe_get_scanline_length)
|
|||
movw %dx, %ax
|
||||
andl $0xFFFF, %eax /* Return value in %eax. */
|
||||
|
||||
popl %edi
|
||||
popl %ebx
|
||||
popl %ebp
|
||||
ret
|
||||
|
||||
/*
|
||||
* grub_vbe_status_t grub_vbe_set_display_start (grub_uint32_t x,
|
||||
* grub_vbe_status_t grub_vbe_bios_set_display_start (grub_uint32_t x,
|
||||
* grub_uint32_t y)
|
||||
*
|
||||
* Register allocations for parameters:
|
||||
* %eax x
|
||||
* %edx y
|
||||
*/
|
||||
FUNCTION(grub_vbe_set_display_start)
|
||||
FUNCTION(grub_vbe_bios_set_display_start)
|
||||
pushl %ebp
|
||||
pushl %ebx
|
||||
|
||||
|
|
@ -2083,16 +2097,17 @@ FUNCTION(grub_vbe_set_display_start)
|
|||
ret
|
||||
|
||||
/*
|
||||
* grub_vbe_status_t grub_vbe_get_display_start (grub_uint32_t *x,
|
||||
* grub_vbe_status_t grub_vbe_bios_get_display_start (grub_uint32_t *x,
|
||||
* grub_uint32_t *y)
|
||||
*
|
||||
* Register allocations for parameters:
|
||||
* %eax *x
|
||||
* %edx *y
|
||||
*/
|
||||
FUNCTION(grub_vbe_get_display_start)
|
||||
FUNCTION(grub_vbe_bios_get_display_start)
|
||||
pushl %ebp
|
||||
pushl %ebx
|
||||
pushl %edi
|
||||
pushl %eax /* Push *x to stack. */
|
||||
pushl %edx /* Push *y to stack. */
|
||||
|
||||
|
|
@ -2119,12 +2134,13 @@ FUNCTION(grub_vbe_get_display_start)
|
|||
movw %bx, %ax
|
||||
andl $0xFFFF, %eax /* Return value in %eax. */
|
||||
|
||||
popl %edi
|
||||
popl %ebx
|
||||
popl %ebp
|
||||
ret
|
||||
|
||||
/*
|
||||
* grub_vbe_status_t grub_vbe_set_palette_data (grub_uint32_t color_count,
|
||||
* grub_vbe_status_t grub_vbe_bios_set_palette_data (grub_uint32_t color_count,
|
||||
* grub_uint32_t start_index,
|
||||
* struct grub_vbe_palette_data *palette_data)
|
||||
*
|
||||
|
|
@ -2133,9 +2149,10 @@ FUNCTION(grub_vbe_get_display_start)
|
|||
* %edx start_index
|
||||
* %ecx *palette_data
|
||||
*/
|
||||
FUNCTION(grub_vbe_set_palette_data)
|
||||
FUNCTION(grub_vbe_bios_set_palette_data)
|
||||
pushl %ebp
|
||||
pushl %ebx
|
||||
pushl %edi
|
||||
|
||||
movl %eax, %ebx /* Store color_count in %ebx. */
|
||||
|
||||
|
|
@ -2165,6 +2182,7 @@ FUNCTION(grub_vbe_set_palette_data)
|
|||
movw %dx, %ax
|
||||
andl $0xFFFF, %eax /* Return value in %eax. */
|
||||
|
||||
popl %edi
|
||||
popl %ebx
|
||||
popl %ebp
|
||||
ret
|
||||
|
|
|
|||
|
|
@ -231,6 +231,8 @@ grub_cmdline_get (const char *prompt, char cmdline[], unsigned max_len,
|
|||
xpos = (plen + lpos) % 79;
|
||||
ypos = ystart + (plen + lpos) / 79;
|
||||
grub_gotoxy (xpos, ypos);
|
||||
|
||||
grub_refresh ();
|
||||
}
|
||||
|
||||
void cl_print (int pos, int c)
|
||||
|
|
@ -271,6 +273,8 @@ grub_cmdline_get (const char *prompt, char cmdline[], unsigned max_len,
|
|||
cl_print (lpos - len, echo_char);
|
||||
cl_set_pos ();
|
||||
}
|
||||
|
||||
grub_refresh ();
|
||||
}
|
||||
|
||||
void cl_delete (unsigned len)
|
||||
|
|
@ -290,6 +294,8 @@ grub_cmdline_get (const char *prompt, char cmdline[], unsigned max_len,
|
|||
cl_print (lpos, echo_char);
|
||||
cl_set_pos ();
|
||||
}
|
||||
|
||||
grub_refresh ();
|
||||
}
|
||||
|
||||
plen = grub_strlen (prompt);
|
||||
|
|
|
|||
794
term/gfxterm.c
Normal file
794
term/gfxterm.c
Normal file
|
|
@ -0,0 +1,794 @@
|
|||
/*
|
||||
* GRUB -- GRand Unified Bootloader
|
||||
* Copyright (C) 2006 Free Software Foundation, Inc.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*/
|
||||
|
||||
#include <grub/machine/memory.h>
|
||||
#include <grub/machine/console.h>
|
||||
#include <grub/term.h>
|
||||
#include <grub/types.h>
|
||||
#include <grub/dl.h>
|
||||
#include <grub/misc.h>
|
||||
#include <grub/normal.h>
|
||||
#include <grub/font.h>
|
||||
#include <grub/arg.h>
|
||||
#include <grub/mm.h>
|
||||
#include <grub/env.h>
|
||||
#include <grub/video.h>
|
||||
|
||||
#define DEFAULT_VIDEO_WIDTH 640
|
||||
#define DEFAULT_VIDEO_HEIGHT 480
|
||||
#define DEFAULT_VIDEO_FLAGS 0
|
||||
|
||||
#define DEFAULT_CHAR_WIDTH 8
|
||||
#define DEFAULT_CHAR_HEIGHT 16
|
||||
|
||||
#define DEFAULT_BORDER_WIDTH 10
|
||||
|
||||
#define DEFAULT_FG_COLOR 0x0a
|
||||
#define DEFAULT_BG_COLOR 0x00
|
||||
#define DEFAULT_CURSOR_COLOR 0x0f
|
||||
|
||||
struct grub_dirty_region
|
||||
{
|
||||
int top_left_x;
|
||||
int top_left_y;
|
||||
int bottom_right_x;
|
||||
int bottom_right_y;
|
||||
};
|
||||
|
||||
struct grub_colored_char
|
||||
{
|
||||
/* An Unicode codepoint. */
|
||||
grub_uint32_t code;
|
||||
|
||||
/* Color values. */
|
||||
grub_video_color_t fg_color;
|
||||
grub_video_color_t bg_color;
|
||||
|
||||
/* The width of this character minus one. */
|
||||
unsigned char width;
|
||||
|
||||
/* The column index of this character. */
|
||||
unsigned char index;
|
||||
};
|
||||
|
||||
struct grub_virtual_screen
|
||||
{
|
||||
/* Dimensions of the virtual screen. */
|
||||
unsigned int width;
|
||||
unsigned int height;
|
||||
|
||||
/* Offset in the display. */
|
||||
unsigned int offset_x;
|
||||
unsigned int offset_y;
|
||||
|
||||
/* TTY Character sizes. */
|
||||
unsigned int char_width;
|
||||
unsigned int char_height;
|
||||
|
||||
/* Virtual screen TTY size. */
|
||||
unsigned int columns;
|
||||
unsigned int rows;
|
||||
|
||||
/* Current cursor details. */
|
||||
unsigned int cursor_x;
|
||||
unsigned int cursor_y;
|
||||
int cursor_state;
|
||||
|
||||
/* 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 bg_color;
|
||||
grub_video_color_t cursor_color;
|
||||
|
||||
/* Text buffer for virtual screen. Contains (columns * rows) number
|
||||
of entries. */
|
||||
struct grub_colored_char *text_buffer;
|
||||
};
|
||||
|
||||
static struct grub_virtual_screen virtual_screen;
|
||||
|
||||
static grub_dl_t my_mod;
|
||||
static struct grub_video_mode_info mode_info;
|
||||
|
||||
static struct grub_video_render_target *text_layer;
|
||||
|
||||
static struct grub_dirty_region dirty_region;
|
||||
|
||||
static void dirty_region_reset (void);
|
||||
|
||||
static int dirty_region_is_empty (void);
|
||||
|
||||
static void dirty_region_add (int x, int y,
|
||||
unsigned int width, unsigned int height);
|
||||
|
||||
static void
|
||||
grub_virtual_screen_free (void)
|
||||
{
|
||||
/* If virtual screen has been allocated, free it. */
|
||||
if (virtual_screen.text_buffer != 0)
|
||||
grub_free (virtual_screen.text_buffer);
|
||||
|
||||
/* Reset virtual screen data. */
|
||||
grub_memset (&virtual_screen, 0, sizeof (virtual_screen));
|
||||
|
||||
/* Free render targets. */
|
||||
grub_video_delete_render_target (text_layer);
|
||||
text_layer = 0;
|
||||
}
|
||||
|
||||
static grub_err_t
|
||||
grub_virtual_screen_setup (unsigned int x, unsigned int y,
|
||||
unsigned int width, unsigned int height)
|
||||
{
|
||||
/* Free old virtual screen. */
|
||||
grub_virtual_screen_free ();
|
||||
|
||||
/* Initialize with default data. */
|
||||
virtual_screen.width = width;
|
||||
virtual_screen.height = height;
|
||||
virtual_screen.offset_x = x;
|
||||
virtual_screen.offset_y = y;
|
||||
virtual_screen.char_width = DEFAULT_CHAR_WIDTH;
|
||||
virtual_screen.char_height = DEFAULT_CHAR_HEIGHT;
|
||||
virtual_screen.cursor_x = 0;
|
||||
virtual_screen.cursor_y = 0;
|
||||
virtual_screen.cursor_state = 1;
|
||||
|
||||
/* Calculate size of text buffer. */
|
||||
virtual_screen.columns = virtual_screen.width / virtual_screen.char_width;
|
||||
virtual_screen.rows = virtual_screen.height / virtual_screen.char_height;
|
||||
|
||||
/* Allocate memory for text buffer. */
|
||||
virtual_screen.text_buffer =
|
||||
(struct grub_colored_char *) grub_malloc (virtual_screen.columns
|
||||
* virtual_screen.rows
|
||||
* sizeof (*virtual_screen.text_buffer));
|
||||
if (grub_errno != GRUB_ERR_NONE)
|
||||
return grub_errno;
|
||||
|
||||
/* Create new render target for text layer. */
|
||||
grub_video_create_render_target (&text_layer,
|
||||
virtual_screen.width,
|
||||
virtual_screen.height,
|
||||
GRUB_VIDEO_MODE_TYPE_RGB
|
||||
| GRUB_VIDEO_MODE_TYPE_ALPHA);
|
||||
if (grub_errno != GRUB_ERR_NONE)
|
||||
return grub_errno;
|
||||
|
||||
/* As we want to have colors compatible with rendering target,
|
||||
we can only have those after mode is initialized. */
|
||||
grub_video_set_active_render_target (text_layer);
|
||||
|
||||
virtual_screen.fg_color_setting = grub_video_map_color (DEFAULT_FG_COLOR);
|
||||
virtual_screen.bg_color_setting = grub_video_map_color (DEFAULT_BG_COLOR);
|
||||
virtual_screen.fg_color = virtual_screen.fg_color_setting;
|
||||
virtual_screen.bg_color = virtual_screen.bg_color_setting;
|
||||
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;
|
||||
}
|
||||
|
||||
static grub_err_t
|
||||
grub_gfxterm_init (void)
|
||||
{
|
||||
char *modevar;
|
||||
int width = DEFAULT_VIDEO_WIDTH;
|
||||
int height = DEFAULT_VIDEO_HEIGHT;
|
||||
int depth = -1;
|
||||
int flags = DEFAULT_VIDEO_FLAGS;
|
||||
grub_video_color_t color;
|
||||
|
||||
/* Parse gfxmode environment variable if set. */
|
||||
modevar = grub_env_get ("gfxmode");
|
||||
if (modevar)
|
||||
{
|
||||
char *tmp;
|
||||
char *param;
|
||||
char *value;
|
||||
|
||||
/* Take copy of env.var. as we don't want to modify that. */
|
||||
tmp = grub_strdup (modevar);
|
||||
modevar = tmp;
|
||||
|
||||
if (grub_errno != GRUB_ERR_NONE)
|
||||
return grub_errno;
|
||||
|
||||
/* Skip whitespace. */
|
||||
while (grub_isspace (*tmp))
|
||||
tmp++;
|
||||
|
||||
/* Initialize token holders. */
|
||||
param = tmp;
|
||||
value = NULL;
|
||||
|
||||
/* Parse <width>x<height>[x<depth>]*/
|
||||
|
||||
/* Find width value. */
|
||||
value = param;
|
||||
param = grub_strchr(param, 'x');
|
||||
if (param == NULL)
|
||||
{
|
||||
/* Free memory before returning. */
|
||||
grub_free (modevar);
|
||||
return grub_error (GRUB_ERR_BAD_ARGUMENT,
|
||||
"Invalid argument: %s\n",
|
||||
param);
|
||||
}
|
||||
|
||||
*param = 0;
|
||||
param++;
|
||||
|
||||
width = grub_strtoul (value, 0, 0);
|
||||
if (grub_errno != GRUB_ERR_NONE)
|
||||
{
|
||||
/* Free memory before returning. */
|
||||
grub_free (modevar);
|
||||
return grub_error (GRUB_ERR_BAD_ARGUMENT,
|
||||
"Invalid argument: %s\n",
|
||||
param);
|
||||
}
|
||||
|
||||
/* Find height value. */
|
||||
value = param;
|
||||
param = grub_strchr(param, 'x');
|
||||
if (param == NULL)
|
||||
{
|
||||
height = grub_strtoul (value, 0, 0);
|
||||
if (grub_errno != GRUB_ERR_NONE)
|
||||
{
|
||||
/* Free memory before returning. */
|
||||
grub_free (modevar);
|
||||
return grub_error (GRUB_ERR_BAD_ARGUMENT,
|
||||
"Invalid argument: %s\n",
|
||||
param);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
/* We have optional color depth value. */
|
||||
*param = 0;
|
||||
param++;
|
||||
|
||||
height = grub_strtoul (value, 0, 0);
|
||||
if (grub_errno != GRUB_ERR_NONE)
|
||||
{
|
||||
/* Free memory before returning. */
|
||||
grub_free (modevar);
|
||||
return grub_error (GRUB_ERR_BAD_ARGUMENT,
|
||||
"Invalid argument: %s\n",
|
||||
param);
|
||||
}
|
||||
|
||||
/* Convert color depth value. */
|
||||
value = param;
|
||||
depth = grub_strtoul (value, 0, 0);
|
||||
if (grub_errno != GRUB_ERR_NONE)
|
||||
{
|
||||
/* Free memory before returning. */
|
||||
grub_free (modevar);
|
||||
return grub_error (GRUB_ERR_BAD_ARGUMENT,
|
||||
"Invalid argument: %s\n",
|
||||
param);
|
||||
}
|
||||
}
|
||||
|
||||
/* Free memory. */
|
||||
grub_free (modevar);
|
||||
}
|
||||
|
||||
/* If we have 8 or less bits, then assuem that it is indexed color mode. */
|
||||
if ((depth <= 8) && (depth != -1))
|
||||
flags |= GRUB_VIDEO_MODE_TYPE_INDEX_COLOR;
|
||||
|
||||
/* We have more than 8 bits, then assume that it is RGB color mode. */
|
||||
if (depth > 8)
|
||||
flags |= GRUB_VIDEO_MODE_TYPE_RGB;
|
||||
|
||||
/* If user requested specific depth, forward that information to driver. */
|
||||
if (depth != -1)
|
||||
flags |= (depth << GRUB_VIDEO_MODE_TYPE_DEPTH_POS)
|
||||
& GRUB_VIDEO_MODE_TYPE_DEPTH_MASK;
|
||||
|
||||
/* Initialize user requested mode. */
|
||||
if (grub_video_setup (width, height, flags) != GRUB_ERR_NONE)
|
||||
return grub_errno;
|
||||
|
||||
/* Figure out what mode we ended up. */
|
||||
if (grub_video_get_info (&mode_info) != GRUB_ERR_NONE)
|
||||
return grub_errno;
|
||||
|
||||
/* Make sure screen is black. */
|
||||
color = grub_video_map_rgb (0, 0, 0);
|
||||
grub_video_fill_rect (color, 0, 0, mode_info.width, mode_info.height);
|
||||
|
||||
/* Leave borders for virtual screen. */
|
||||
width = mode_info.width - (2 * DEFAULT_BORDER_WIDTH);
|
||||
height = mode_info.height - (2 * DEFAULT_BORDER_WIDTH);
|
||||
|
||||
/* Create virtual screen. */
|
||||
if (grub_virtual_screen_setup (DEFAULT_BORDER_WIDTH, DEFAULT_BORDER_WIDTH,
|
||||
width, height) != GRUB_ERR_NONE)
|
||||
{
|
||||
grub_video_restore ();
|
||||
return grub_errno;
|
||||
}
|
||||
|
||||
/* Mark whole screen as dirty. */
|
||||
dirty_region_reset ();
|
||||
dirty_region_add (0, 0, mode_info.width, mode_info.height);
|
||||
|
||||
return (grub_errno = GRUB_ERR_NONE);
|
||||
}
|
||||
|
||||
static grub_err_t
|
||||
grub_gfxterm_fini (void)
|
||||
{
|
||||
grub_virtual_screen_free ();
|
||||
|
||||
grub_video_restore ();
|
||||
|
||||
return GRUB_ERR_NONE;
|
||||
}
|
||||
|
||||
static void
|
||||
redraw_screen_rect (unsigned int x, unsigned int y,
|
||||
unsigned int width, unsigned int height)
|
||||
{
|
||||
grub_video_color_t color;
|
||||
|
||||
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. */
|
||||
grub_video_blit_render_target (text_layer, x, y,
|
||||
x - virtual_screen.offset_x,
|
||||
y - virtual_screen.offset_y,
|
||||
width, height);
|
||||
}
|
||||
|
||||
static void
|
||||
dirty_region_reset (void)
|
||||
{
|
||||
dirty_region.top_left_x = -1;
|
||||
dirty_region.top_left_y = -1;
|
||||
dirty_region.bottom_right_x = -1;
|
||||
dirty_region.bottom_right_y = -1;
|
||||
}
|
||||
|
||||
static int
|
||||
dirty_region_is_empty (void)
|
||||
{
|
||||
if ((dirty_region.top_left_x == -1)
|
||||
|| (dirty_region.top_left_y == -1)
|
||||
|| (dirty_region.bottom_right_x == -1)
|
||||
|| (dirty_region.bottom_right_y == -1))
|
||||
return 1;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void
|
||||
dirty_region_add (int x, int y, unsigned int width, unsigned int height)
|
||||
{
|
||||
if ((width == 0) || (height == 0))
|
||||
return;
|
||||
|
||||
if (dirty_region_is_empty ())
|
||||
{
|
||||
dirty_region.top_left_x = x;
|
||||
dirty_region.top_left_y = y;
|
||||
dirty_region.bottom_right_x = x + width - 1;
|
||||
dirty_region.bottom_right_y = y + height - 1;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (x < dirty_region.top_left_x)
|
||||
dirty_region.top_left_x = x;
|
||||
if (y < dirty_region.top_left_y)
|
||||
dirty_region.top_left_y = y;
|
||||
if ((x + (int)width - 1) > dirty_region.bottom_right_x)
|
||||
dirty_region.bottom_right_x = x + width - 1;
|
||||
if ((y + (int)height - 1) > dirty_region.bottom_right_y)
|
||||
dirty_region.bottom_right_y = y + height - 1;
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
dirty_region_add_virtualscreen (void)
|
||||
{
|
||||
/* Mark virtual screen as dirty. */
|
||||
dirty_region_add (virtual_screen.offset_x, virtual_screen.offset_y,
|
||||
virtual_screen.width, virtual_screen.height);
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
dirty_region_redraw (void)
|
||||
{
|
||||
int x;
|
||||
int y;
|
||||
int width;
|
||||
int height;
|
||||
|
||||
if (dirty_region_is_empty ())
|
||||
return;
|
||||
|
||||
x = dirty_region.top_left_x;
|
||||
y = dirty_region.top_left_y;
|
||||
|
||||
width = dirty_region.bottom_right_x - x + 1;
|
||||
height = dirty_region.bottom_right_y - y + 1;
|
||||
|
||||
redraw_screen_rect (x, y, width, height);
|
||||
|
||||
dirty_region_reset ();
|
||||
}
|
||||
|
||||
static void
|
||||
write_char (void)
|
||||
{
|
||||
struct grub_colored_char *p;
|
||||
struct grub_font_glyph glyph;
|
||||
grub_video_color_t color;
|
||||
grub_video_color_t bgcolor;
|
||||
unsigned int x;
|
||||
unsigned int y;
|
||||
|
||||
/* Find out active character. */
|
||||
p = (virtual_screen.text_buffer
|
||||
+ virtual_screen.cursor_x
|
||||
+ (virtual_screen.cursor_y * virtual_screen.columns));
|
||||
|
||||
p -= p->index;
|
||||
|
||||
/* Get glyph for character. */
|
||||
grub_font_get_glyph (p->code, &glyph);
|
||||
|
||||
color = p->fg_color;
|
||||
bgcolor = p->bg_color;
|
||||
|
||||
x = virtual_screen.cursor_x * virtual_screen.char_width;
|
||||
y = virtual_screen.cursor_y * virtual_screen.char_height;
|
||||
|
||||
/* Render glyph to text layer. */
|
||||
grub_video_set_active_render_target (text_layer);
|
||||
grub_video_fill_rect (bgcolor, x, y, glyph.width, glyph.height);
|
||||
grub_video_blit_glyph (&glyph, color, x, y);
|
||||
grub_video_set_active_render_target (GRUB_VIDEO_RENDER_TARGET_DISPLAY);
|
||||
|
||||
/* Mark character to be drawn. */
|
||||
dirty_region_add (virtual_screen.offset_x + x, virtual_screen.offset_y + y,
|
||||
glyph.width, glyph.height);
|
||||
}
|
||||
|
||||
static void
|
||||
write_cursor (void)
|
||||
{
|
||||
unsigned int x;
|
||||
unsigned int y;
|
||||
unsigned int width;
|
||||
unsigned int height;
|
||||
grub_video_color_t color;
|
||||
|
||||
/* Determine cursor properties and position on text layer. */
|
||||
x = virtual_screen.cursor_x * virtual_screen.char_width;
|
||||
y = ((virtual_screen.cursor_y + 1) * virtual_screen.char_height) - 3;
|
||||
width = virtual_screen.char_width;
|
||||
height = 2;
|
||||
|
||||
color = virtual_screen.cursor_color;
|
||||
|
||||
/* Render cursor to text layer. */
|
||||
grub_video_set_active_render_target (text_layer);
|
||||
grub_video_fill_rect (color, x, y, width, height);
|
||||
grub_video_set_active_render_target (GRUB_VIDEO_RENDER_TARGET_DISPLAY);
|
||||
|
||||
/* Mark cursor to be redrawn. */
|
||||
dirty_region_add (virtual_screen.offset_x + x, virtual_screen.offset_y + y,
|
||||
width, height);
|
||||
}
|
||||
|
||||
static void
|
||||
scroll_up (void)
|
||||
{
|
||||
unsigned int i;
|
||||
grub_video_color_t color;
|
||||
|
||||
/* Scroll text buffer with one line to up. */
|
||||
grub_memmove (virtual_screen.text_buffer,
|
||||
virtual_screen.text_buffer + virtual_screen.columns,
|
||||
sizeof (*virtual_screen.text_buffer)
|
||||
* virtual_screen.columns
|
||||
* (virtual_screen.rows - 1));
|
||||
|
||||
/* Clear last line in text buffer. */
|
||||
for (i = virtual_screen.columns * (virtual_screen.rows - 1);
|
||||
i < virtual_screen.columns * virtual_screen.rows;
|
||||
i++)
|
||||
{
|
||||
virtual_screen.text_buffer[i].code = ' ';
|
||||
virtual_screen.text_buffer[i].fg_color = virtual_screen.fg_color;
|
||||
virtual_screen.text_buffer[i].bg_color = virtual_screen.bg_color;
|
||||
virtual_screen.text_buffer[i].width = 0;
|
||||
virtual_screen.text_buffer[i].index = 0;
|
||||
}
|
||||
|
||||
/* Scroll physical screen. */
|
||||
grub_video_set_active_render_target (text_layer);
|
||||
color = virtual_screen.bg_color;
|
||||
grub_video_scroll (color, 0, -virtual_screen.char_height);
|
||||
grub_video_set_active_render_target (GRUB_VIDEO_RENDER_TARGET_DISPLAY);
|
||||
|
||||
/* Mark virtual screen to be redrawn. */
|
||||
dirty_region_add_virtualscreen ();
|
||||
}
|
||||
|
||||
static void
|
||||
grub_gfxterm_putchar (grub_uint32_t c)
|
||||
{
|
||||
if (c == '\a')
|
||||
/* FIXME */
|
||||
return;
|
||||
|
||||
if (c == '\b' || c == '\n' || c == '\r')
|
||||
{
|
||||
/* Erase current cursor, if any. */
|
||||
if (virtual_screen.cursor_state)
|
||||
write_char ();
|
||||
|
||||
switch (c)
|
||||
{
|
||||
case '\b':
|
||||
if (virtual_screen.cursor_x > 0)
|
||||
virtual_screen.cursor_x--;
|
||||
break;
|
||||
|
||||
case '\n':
|
||||
if (virtual_screen.cursor_y >= virtual_screen.rows - 1)
|
||||
scroll_up ();
|
||||
else
|
||||
virtual_screen.cursor_y++;
|
||||
break;
|
||||
|
||||
case '\r':
|
||||
virtual_screen.cursor_x = 0;
|
||||
break;
|
||||
}
|
||||
|
||||
/* Redraw cursor if visible. */
|
||||
if (virtual_screen.cursor_state)
|
||||
write_cursor ();
|
||||
}
|
||||
else
|
||||
{
|
||||
struct grub_font_glyph glyph;
|
||||
struct grub_colored_char *p;
|
||||
|
||||
/* Get properties of the character. */
|
||||
grub_font_get_glyph (c, &glyph);
|
||||
|
||||
/* If we are about to exceed line length, wrap to next line. */
|
||||
if (virtual_screen.cursor_x + glyph.char_width > virtual_screen.columns)
|
||||
grub_putchar ('\n');
|
||||
|
||||
/* Find position on virtual screen, and fill information. */
|
||||
p = (virtual_screen.text_buffer +
|
||||
virtual_screen.cursor_x +
|
||||
virtual_screen.cursor_y * virtual_screen.columns);
|
||||
p->code = c;
|
||||
p->fg_color = virtual_screen.fg_color;
|
||||
p->bg_color = virtual_screen.bg_color;
|
||||
p->width = glyph.char_width - 1;
|
||||
p->index = 0;
|
||||
|
||||
/* If we have large glyph, add fixup info. */
|
||||
if (glyph.char_width > 1)
|
||||
{
|
||||
unsigned i;
|
||||
|
||||
for (i = 1; i < glyph.char_width; i++)
|
||||
{
|
||||
p[i].code = ' ';
|
||||
p[i].width = glyph.char_width - 1;
|
||||
p[i].index = i;
|
||||
}
|
||||
}
|
||||
|
||||
/* Draw glyph. */
|
||||
write_char ();
|
||||
|
||||
/* Make sure we scroll screen when needed and wrap line correctly. */
|
||||
virtual_screen.cursor_x += glyph.char_width;
|
||||
if (virtual_screen.cursor_x >= virtual_screen.columns)
|
||||
{
|
||||
virtual_screen.cursor_x = 0;
|
||||
|
||||
if (virtual_screen.cursor_y >= virtual_screen.rows - 1)
|
||||
scroll_up ();
|
||||
else
|
||||
virtual_screen.cursor_y++;
|
||||
}
|
||||
|
||||
/* Draw cursor if visible. */
|
||||
if (virtual_screen.cursor_state)
|
||||
write_cursor ();
|
||||
}
|
||||
}
|
||||
|
||||
static grub_ssize_t
|
||||
grub_gfxterm_getcharwidth (grub_uint32_t c)
|
||||
{
|
||||
struct grub_font_glyph glyph;
|
||||
|
||||
if (! grub_font_get_glyph (c, &glyph))
|
||||
return 0;
|
||||
|
||||
return glyph.char_width;
|
||||
}
|
||||
|
||||
static grub_uint16_t
|
||||
grub_virtual_screen_getwh (void)
|
||||
{
|
||||
return (virtual_screen.columns << 8) | virtual_screen.rows;
|
||||
}
|
||||
|
||||
static grub_uint16_t
|
||||
grub_virtual_screen_getxy (void)
|
||||
{
|
||||
return ((virtual_screen.cursor_x << 8) | virtual_screen.cursor_y);
|
||||
}
|
||||
|
||||
static void
|
||||
grub_gfxterm_gotoxy (grub_uint8_t x, grub_uint8_t y)
|
||||
{
|
||||
if (x >= virtual_screen.columns)
|
||||
x = virtual_screen.columns - 1;
|
||||
|
||||
if (y >= virtual_screen.rows)
|
||||
y = virtual_screen.rows - 1;
|
||||
|
||||
if (virtual_screen.cursor_state)
|
||||
write_char ();
|
||||
|
||||
virtual_screen.cursor_x = x;
|
||||
virtual_screen.cursor_y = y;
|
||||
|
||||
if (virtual_screen.cursor_state)
|
||||
write_cursor ();
|
||||
}
|
||||
|
||||
static void
|
||||
grub_virtual_screen_cls (void)
|
||||
{
|
||||
grub_uint32_t i;
|
||||
|
||||
for (i = 0; i < virtual_screen.columns * virtual_screen.rows; i++)
|
||||
{
|
||||
virtual_screen.text_buffer[i].code = ' ';
|
||||
virtual_screen.text_buffer[i].fg_color = virtual_screen.fg_color;
|
||||
virtual_screen.text_buffer[i].bg_color = virtual_screen.bg_color;
|
||||
virtual_screen.text_buffer[i].width = 0;
|
||||
virtual_screen.text_buffer[i].index = 0;
|
||||
}
|
||||
|
||||
virtual_screen.cursor_x = virtual_screen.cursor_y = 0;
|
||||
}
|
||||
|
||||
static void
|
||||
grub_gfxterm_cls (void)
|
||||
{
|
||||
grub_video_color_t color;
|
||||
|
||||
/* Clear virtual screen. */
|
||||
grub_virtual_screen_cls ();
|
||||
|
||||
/* Clear text layer. */
|
||||
grub_video_set_active_render_target (text_layer);
|
||||
color = virtual_screen.bg_color_setting;
|
||||
grub_video_fill_rect (color, 0, 0, mode_info.width, mode_info.height);
|
||||
grub_video_set_active_render_target (GRUB_VIDEO_RENDER_TARGET_DISPLAY);
|
||||
|
||||
/* Mark virtual screen to be redrawn. */
|
||||
dirty_region_add_virtualscreen ();
|
||||
}
|
||||
|
||||
static void
|
||||
grub_virtual_screen_setcolorstate (grub_term_color_state state)
|
||||
{
|
||||
switch (state)
|
||||
{
|
||||
case GRUB_TERM_COLOR_STANDARD:
|
||||
case GRUB_TERM_COLOR_NORMAL:
|
||||
virtual_screen.fg_color = virtual_screen.fg_color_setting;
|
||||
virtual_screen.bg_color = virtual_screen.bg_color_setting;
|
||||
break;
|
||||
case GRUB_TERM_COLOR_HIGHLIGHT:
|
||||
virtual_screen.fg_color = virtual_screen.bg_color_setting;
|
||||
virtual_screen.bg_color = virtual_screen.fg_color_setting;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
grub_virtual_screen_setcolor (grub_uint8_t normal_color,
|
||||
grub_uint8_t highlight_color)
|
||||
{
|
||||
virtual_screen.fg_color_setting = grub_video_map_color (normal_color);
|
||||
virtual_screen.bg_color_setting = grub_video_map_color (highlight_color);
|
||||
}
|
||||
|
||||
static void
|
||||
grub_gfxterm_setcursor (int on)
|
||||
{
|
||||
if (virtual_screen.cursor_state != on)
|
||||
{
|
||||
if (virtual_screen.cursor_state)
|
||||
write_char ();
|
||||
else
|
||||
write_cursor ();
|
||||
|
||||
virtual_screen.cursor_state = on;
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
grub_gfxterm_refresh (void)
|
||||
{
|
||||
/* Redraw only changed regions. */
|
||||
dirty_region_redraw ();
|
||||
}
|
||||
|
||||
static struct grub_term grub_video_term =
|
||||
{
|
||||
.name = "gfxterm",
|
||||
.init = grub_gfxterm_init,
|
||||
.fini = grub_gfxterm_fini,
|
||||
.putchar = grub_gfxterm_putchar,
|
||||
.getcharwidth = grub_gfxterm_getcharwidth,
|
||||
.checkkey = grub_console_checkkey,
|
||||
.getkey = grub_console_getkey,
|
||||
.getwh = grub_virtual_screen_getwh,
|
||||
.getxy = grub_virtual_screen_getxy,
|
||||
.gotoxy = grub_gfxterm_gotoxy,
|
||||
.cls = grub_gfxterm_cls,
|
||||
.setcolorstate = grub_virtual_screen_setcolorstate,
|
||||
.setcolor = grub_virtual_screen_setcolor,
|
||||
.setcursor = grub_gfxterm_setcursor,
|
||||
.refresh = grub_gfxterm_refresh,
|
||||
.flags = 0,
|
||||
.next = 0
|
||||
};
|
||||
|
||||
GRUB_MOD_INIT(term_gfxterm)
|
||||
{
|
||||
my_mod = mod;
|
||||
grub_term_register (&grub_video_term);
|
||||
}
|
||||
|
||||
GRUB_MOD_FINI(term_gfxterm)
|
||||
{
|
||||
grub_term_unregister (&grub_video_term);
|
||||
}
|
||||
1308
video/i386/pc/vbe.c
1308
video/i386/pc/vbe.c
File diff suppressed because it is too large
Load diff
306
video/video.c
Normal file
306
video/video.c
Normal file
|
|
@ -0,0 +1,306 @@
|
|||
/*
|
||||
* GRUB -- GRand Unified Bootloader
|
||||
* Copyright (C) 2006 Free Software Foundation, Inc.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*/
|
||||
|
||||
#include <grub/video.h>
|
||||
#include <grub/types.h>
|
||||
#include <grub/dl.h>
|
||||
|
||||
/* The list of video adapters registerd to system. */
|
||||
static grub_video_adapter_t grub_video_adapter_list;
|
||||
|
||||
/* Active video adapter. */
|
||||
static grub_video_adapter_t grub_video_adapter_active;
|
||||
|
||||
void
|
||||
grub_video_register (grub_video_adapter_t adapter)
|
||||
{
|
||||
adapter->next = grub_video_adapter_list;
|
||||
grub_video_adapter_list = adapter;
|
||||
}
|
||||
|
||||
void
|
||||
grub_video_unregister (grub_video_adapter_t adapter)
|
||||
{
|
||||
grub_video_adapter_t *p, q;
|
||||
|
||||
for (p = &grub_video_adapter_list, q = *p; q; p = &(q->next), q = q->next)
|
||||
if (q == adapter)
|
||||
{
|
||||
*p = q->next;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
grub_video_iterate (int (*hook) (grub_video_adapter_t adapter))
|
||||
{
|
||||
grub_video_adapter_t p;
|
||||
|
||||
for (p = grub_video_adapter_list; p; p = p->next)
|
||||
if (hook (p))
|
||||
break;
|
||||
}
|
||||
|
||||
grub_err_t
|
||||
grub_video_setup (unsigned int width, unsigned int height,
|
||||
unsigned int mode_type)
|
||||
{
|
||||
grub_video_adapter_t p;
|
||||
|
||||
/* De-activate last set video adapter. */
|
||||
if (grub_video_adapter_active)
|
||||
{
|
||||
/* Finalize adapter. */
|
||||
grub_video_adapter_active->fini ();
|
||||
if (grub_errno != GRUB_ERR_NONE)
|
||||
return grub_errno;
|
||||
|
||||
/* Mark active adapter as not set. */
|
||||
grub_video_adapter_active = 0;
|
||||
}
|
||||
|
||||
/* Loop thru all possible video adapter trying to find requested mode. */
|
||||
for (p = grub_video_adapter_list; p; p = p->next)
|
||||
{
|
||||
/* Try to initialize adapter, if can't skip to next. */
|
||||
p->init ();
|
||||
if (grub_errno != GRUB_ERR_NONE)
|
||||
{
|
||||
grub_errno = GRUB_ERR_NONE;
|
||||
continue;
|
||||
}
|
||||
|
||||
/* Try to initialize video mode. */
|
||||
p->setup (width, height, mode_type);
|
||||
if (grub_errno == GRUB_ERR_NONE)
|
||||
{
|
||||
/* Valid mode found from adapter, and it has been activated.
|
||||
Specify it as active adapter. */
|
||||
grub_video_adapter_active = p;
|
||||
return GRUB_ERR_NONE;
|
||||
}
|
||||
else
|
||||
grub_errno = GRUB_ERR_NONE;
|
||||
|
||||
/* No valid mode found in this adapter, finalize adapter. */
|
||||
p->fini ();
|
||||
if (grub_errno != GRUB_ERR_NONE)
|
||||
return grub_errno;
|
||||
}
|
||||
|
||||
/* We couldn't find suitable adapter for specified mode. */
|
||||
return grub_error (GRUB_ERR_UNKNOWN_DEVICE,
|
||||
"Can't locate valid adapter for mode");
|
||||
}
|
||||
|
||||
grub_err_t
|
||||
grub_video_restore (void)
|
||||
{
|
||||
if (grub_video_adapter_active)
|
||||
{
|
||||
grub_video_adapter_active->fini ();
|
||||
if (grub_errno != GRUB_ERR_NONE)
|
||||
return grub_errno;
|
||||
|
||||
grub_video_adapter_active = 0;
|
||||
}
|
||||
return GRUB_ERR_NONE;
|
||||
}
|
||||
|
||||
grub_err_t
|
||||
grub_video_get_info (struct grub_video_mode_info *mode_info)
|
||||
{
|
||||
if (! grub_video_adapter_active)
|
||||
return grub_error (GRUB_ERR_BAD_DEVICE, "No video mode activated");
|
||||
|
||||
return grub_video_adapter_active->get_info (mode_info);
|
||||
}
|
||||
|
||||
grub_err_t
|
||||
grub_video_set_palette (unsigned int start, unsigned int count,
|
||||
struct grub_video_palette_data *palette_data)
|
||||
{
|
||||
if (! grub_video_adapter_active)
|
||||
return grub_error (GRUB_ERR_BAD_DEVICE, "No video mode activated");
|
||||
|
||||
return grub_video_adapter_active->set_palette (start, count, palette_data);
|
||||
}
|
||||
|
||||
grub_err_t
|
||||
grub_video_get_palette (unsigned int start, unsigned int count,
|
||||
struct grub_video_palette_data *palette_data)
|
||||
{
|
||||
if (! grub_video_adapter_active)
|
||||
return grub_error (GRUB_ERR_BAD_DEVICE, "No video mode activated");
|
||||
|
||||
return grub_video_adapter_active->get_palette (start, count, palette_data);
|
||||
}
|
||||
|
||||
grub_err_t
|
||||
grub_video_set_viewport (unsigned int x, unsigned int y,
|
||||
unsigned int width, unsigned int height)
|
||||
{
|
||||
if (! grub_video_adapter_active)
|
||||
return grub_error (GRUB_ERR_BAD_DEVICE, "No video mode activated");
|
||||
|
||||
return grub_video_adapter_active->set_viewport (x, y, width, height);
|
||||
}
|
||||
|
||||
grub_err_t
|
||||
grub_video_get_viewport (unsigned int *x, unsigned int *y,
|
||||
unsigned int *width, unsigned int *height)
|
||||
{
|
||||
if (! grub_video_adapter_active)
|
||||
return grub_error (GRUB_ERR_BAD_DEVICE, "No video mode activated");
|
||||
|
||||
return grub_video_adapter_active->get_viewport (x, y, width, height);
|
||||
}
|
||||
|
||||
grub_video_color_t
|
||||
grub_video_map_color (grub_uint32_t color_name)
|
||||
{
|
||||
if (! grub_video_adapter_active)
|
||||
return 0;
|
||||
|
||||
return grub_video_adapter_active->map_color (color_name);
|
||||
}
|
||||
|
||||
grub_video_color_t
|
||||
grub_video_map_rgb (grub_uint8_t red, grub_uint8_t green, grub_uint8_t blue)
|
||||
{
|
||||
if (! grub_video_adapter_active)
|
||||
return 0;
|
||||
|
||||
return grub_video_adapter_active->map_rgb (red, green, blue);
|
||||
}
|
||||
|
||||
grub_video_color_t
|
||||
grub_video_map_rgba (grub_uint8_t red, grub_uint8_t green, grub_uint8_t blue,
|
||||
grub_uint8_t alpha)
|
||||
{
|
||||
if (! grub_video_adapter_active)
|
||||
return 0;
|
||||
|
||||
return grub_video_adapter_active->map_rgba (red, green, blue, alpha);
|
||||
}
|
||||
|
||||
grub_err_t
|
||||
grub_video_fill_rect (grub_video_color_t color, int x, int y,
|
||||
unsigned int width, unsigned int height)
|
||||
{
|
||||
if (! grub_video_adapter_active)
|
||||
return grub_error (GRUB_ERR_BAD_DEVICE, "No video mode activated");
|
||||
|
||||
return grub_video_adapter_active->fill_rect (color, x, y, width, height);
|
||||
}
|
||||
|
||||
grub_err_t
|
||||
grub_video_blit_glyph (struct grub_font_glyph *glyph,
|
||||
grub_video_color_t color, int x, int y)
|
||||
{
|
||||
if (! grub_video_adapter_active)
|
||||
return grub_error (GRUB_ERR_BAD_DEVICE, "No video mode activated");
|
||||
|
||||
return grub_video_adapter_active->blit_glyph (glyph, color, x, y);
|
||||
}
|
||||
|
||||
grub_err_t
|
||||
grub_video_blit_bitmap (struct grub_video_bitmap *bitmap,
|
||||
int x, int y, int offset_x, int offset_y,
|
||||
unsigned int width, unsigned int height)
|
||||
{
|
||||
if (! grub_video_adapter_active)
|
||||
return grub_error (GRUB_ERR_BAD_DEVICE, "No video mode activated");
|
||||
|
||||
return grub_video_adapter_active->blit_bitmap (bitmap, x, y,
|
||||
offset_x, offset_y,
|
||||
width, height);
|
||||
}
|
||||
|
||||
grub_err_t
|
||||
grub_video_blit_render_target (struct grub_video_render_target *target,
|
||||
int x, int y, int offset_x, int offset_y,
|
||||
unsigned int width, unsigned int height)
|
||||
{
|
||||
if (! grub_video_adapter_active)
|
||||
return grub_error (GRUB_ERR_BAD_DEVICE, "No video mode activated");
|
||||
|
||||
return grub_video_adapter_active->blit_render_target (target, x, y,
|
||||
offset_x, offset_y,
|
||||
width, height);
|
||||
}
|
||||
|
||||
grub_err_t
|
||||
grub_video_scroll (grub_video_color_t color, int dx, int dy)
|
||||
{
|
||||
if (! grub_video_adapter_active)
|
||||
return grub_error (GRUB_ERR_BAD_DEVICE, "No video mode activated");
|
||||
|
||||
return grub_video_adapter_active->scroll (color, dx, dy);
|
||||
}
|
||||
|
||||
grub_err_t
|
||||
grub_video_swap_buffers (void)
|
||||
{
|
||||
if (! grub_video_adapter_active)
|
||||
return grub_error (GRUB_ERR_BAD_DEVICE, "No video mode activated");
|
||||
|
||||
return grub_video_adapter_active->swap_buffers ();
|
||||
}
|
||||
|
||||
grub_err_t
|
||||
grub_video_create_render_target (struct grub_video_render_target **result,
|
||||
unsigned int width, unsigned int height,
|
||||
unsigned int mode_type)
|
||||
{
|
||||
if (! grub_video_adapter_active)
|
||||
return grub_error (GRUB_ERR_BAD_DEVICE, "No video mode activated");
|
||||
|
||||
return grub_video_adapter_active->create_render_target (result,
|
||||
width, height,
|
||||
mode_type);
|
||||
}
|
||||
|
||||
grub_err_t
|
||||
grub_video_delete_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->delete_render_target (target);
|
||||
}
|
||||
|
||||
grub_err_t
|
||||
grub_video_set_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->set_active_render_target (target);
|
||||
}
|
||||
|
||||
GRUB_MOD_INIT(video_video)
|
||||
{
|
||||
grub_video_adapter_active = 0;
|
||||
grub_video_adapter_list = 0;
|
||||
}
|
||||
|
||||
GRUB_MOD_FINI(video_video)
|
||||
{
|
||||
}
|
||||
Loading…
Reference in a new issue