* 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.
267 lines
5.8 KiB
C
267 lines
5.8 KiB
C
/*
|
|
* GRUB -- GRand Unified Bootloader
|
|
* 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
|
|
* 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/file.h>
|
|
#include <grub/misc.h>
|
|
#include <grub/dl.h>
|
|
#include <grub/normal.h>
|
|
#include <grub/types.h>
|
|
#include <grub/mm.h>
|
|
#include <grub/font.h>
|
|
|
|
struct entry
|
|
{
|
|
grub_uint32_t code;
|
|
grub_uint32_t offset;
|
|
};
|
|
|
|
struct font
|
|
{
|
|
struct font *next;
|
|
grub_file_t file;
|
|
grub_uint32_t num;
|
|
struct entry table[0];
|
|
};
|
|
|
|
static struct font *font_list;
|
|
|
|
static int
|
|
add_font (const char *filename)
|
|
{
|
|
grub_file_t file = 0;
|
|
char magic[4];
|
|
grub_uint32_t num, i;
|
|
struct font *font = 0;
|
|
|
|
file = grub_file_open (filename);
|
|
if (! file)
|
|
goto fail;
|
|
|
|
if (grub_file_read (file, magic, 4) != 4)
|
|
goto fail;
|
|
|
|
if (grub_memcmp (magic, GRUB_FONT_MAGIC, 4) != 0)
|
|
{
|
|
grub_error (GRUB_ERR_BAD_FONT, "invalid font magic");
|
|
goto fail;
|
|
}
|
|
|
|
if (grub_file_read (file, (char *) &num, 4) != 4)
|
|
goto fail;
|
|
|
|
num = grub_le_to_cpu32 (num);
|
|
font = (struct font *) grub_malloc (sizeof (struct font)
|
|
+ sizeof (struct entry) * num);
|
|
if (! font)
|
|
goto fail;
|
|
|
|
font->file = file;
|
|
font->num = num;
|
|
|
|
for (i = 0; i < num; i++)
|
|
{
|
|
grub_uint32_t code, offset;
|
|
|
|
if (grub_file_read (file, (char *) &code, 4) != 4)
|
|
goto fail;
|
|
|
|
if (grub_file_read (file, (char *) &offset, 4) != 4)
|
|
goto fail;
|
|
|
|
font->table[i].code = grub_le_to_cpu32 (code);
|
|
font->table[i].offset = grub_le_to_cpu32 (offset);
|
|
}
|
|
|
|
font->next = font_list;
|
|
font_list = font;
|
|
|
|
return 1;
|
|
|
|
fail:
|
|
if (font)
|
|
grub_free (font);
|
|
|
|
if (file)
|
|
grub_file_close (file);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static void
|
|
remove_font (struct font *font)
|
|
{
|
|
struct font **p, *q;
|
|
|
|
for (p = &font_list, q = *p; q; p = &(q->next), q = q->next)
|
|
if (q == font)
|
|
{
|
|
*p = q->next;
|
|
|
|
grub_file_close (font->file);
|
|
grub_free (font);
|
|
|
|
break;
|
|
}
|
|
}
|
|
|
|
/* Return the offset of the glyph corresponding to the codepoint CODE
|
|
in the font FONT. If no found, return zero. */
|
|
static grub_uint32_t
|
|
find_glyph (const struct font *font, grub_uint32_t code)
|
|
{
|
|
grub_uint32_t start = 0;
|
|
grub_uint32_t end = font->num - 1;
|
|
struct entry *table = font->table;
|
|
|
|
/* This shouldn't happen. */
|
|
if (font->num == 0)
|
|
return 0;
|
|
|
|
/* Do a binary search. */
|
|
while (start <= end)
|
|
{
|
|
grub_uint32_t i = (start + end) / 2;
|
|
|
|
if (table[i].code < code)
|
|
start = i + 1;
|
|
else if (table[i].code > code)
|
|
end = i - 1;
|
|
else
|
|
return table[i].offset;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
/* Set the glyph to something stupid. */
|
|
static void
|
|
fill_with_default_glyph (grub_font_glyph_t glyph)
|
|
{
|
|
unsigned i;
|
|
|
|
for (i = 0; i < 16; i++)
|
|
glyph->bitmap[i] = (i & 1) ? 0x55 : 0xaa;
|
|
|
|
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 glyph
|
|
information with something, even if no glyph is found. */
|
|
int
|
|
grub_font_get_glyph (grub_uint32_t code,
|
|
grub_font_glyph_t glyph)
|
|
{
|
|
struct font *font;
|
|
grub_uint8_t bitmap[32];
|
|
|
|
/* FIXME: It is necessary to cache glyphs! */
|
|
|
|
restart:
|
|
for (font = font_list; font; font = font->next)
|
|
{
|
|
grub_uint32_t offset;
|
|
|
|
offset = find_glyph (font, 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 ((len = grub_file_read (font->file, (char *) &w, sizeof (w)))
|
|
!= sizeof (w))
|
|
{
|
|
remove_font (font);
|
|
goto restart;
|
|
}
|
|
|
|
w = grub_le_to_cpu32 (w);
|
|
if (w != 1 && w != 2)
|
|
{
|
|
/* grub_error (GRUB_ERR_BAD_FONT, "invalid width"); */
|
|
remove_font (font);
|
|
goto restart;
|
|
}
|
|
|
|
if (bitmap
|
|
&& (grub_file_read (font->file, bitmap, w * 16)
|
|
!= (grub_ssize_t) w * 16))
|
|
{
|
|
remove_font (font);
|
|
goto restart;
|
|
}
|
|
|
|
/* 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 (glyph);
|
|
return 0;
|
|
}
|
|
|
|
static grub_err_t
|
|
font_command (struct grub_arg_list *state __attribute__ ((unused)),
|
|
int argc __attribute__ ((unused)),
|
|
char **args __attribute__ ((unused)))
|
|
{
|
|
if (argc == 0)
|
|
return grub_error (GRUB_ERR_BAD_ARGUMENT, "no font specified");
|
|
|
|
while (argc--)
|
|
if (! add_font (*args++))
|
|
return 1;
|
|
|
|
return 0;
|
|
}
|
|
|
|
GRUB_MOD_INIT(font_manager)
|
|
{
|
|
grub_register_command ("font", font_command, GRUB_COMMAND_FLAG_BOTH,
|
|
"font FILE...",
|
|
"Specify one or more font files to display.", 0);
|
|
}
|
|
|
|
GRUB_MOD_FINI(font_manager)
|
|
{
|
|
grub_unregister_command ("font");
|
|
}
|