2009-01-02 Colin D Bennett <colin@gibibit.com>
New font engine. Additional changes by Vesa Jääskeläinen <chaac@nic.fi> to adapt to build system and fixed gfxterm.c to work with different sized fonts. * configure.ac: Changed UNIFONT_HEX to UNIFONT_BDF. * configure: Re-generated. * DISTLIST: Removed font/manager.c. Added font/font.c. Added font/font_cmd.c. * Makefile.in: Changed UNIFONT_HEX to UNIFONT_BDF. Added Font tool compilation. * include/grub/misc.h (grub_utf8_to_ucs4): Changed prototype. Changed users. * kern/misc.c (grub_utf8_to_ucs4): Changed prototype. * kern/term.c: Changed users of grub_utf8_to_ucs4. * normal/menu.c: Likewise. * conf/common.rmk (font_mod_SOURCES): Removed font/manager.c. (font_mod_SOURCES): Added font/font_cmd.c, font/font.c. * include/grub/font.h: Replaced with new file. * include/grub/video.h (GRUB_VIDEO_MODE_TYPE_ALPHA): Changed value. (GRUB_VIDEO_MODE_TYPE_DOUBLE_BUFFERED): Likewise. (GRUB_VIDEO_MODE_TYPE_COLOR_MASK): Likewise. (GRUB_VIDEO_MODE_TYPE_1BIT_BITMAP): Added. (grub_video_blit_format): Added GRUB_VIDEO_BLIT_FORMAT_1BIT_PACKED. (grub_video_mode_info): Added bg_red, bg_green, bg_blue, bg_alpha, fg_red, fg_green, fg_blue, fg_alpha. (grub_video_adapter): Removed blit_glyph. (grub_video_blit_glyph): Removed. * font/manager.c: Removed file. * font/font.c: New file. * font/font_cmd.c: Likewise. * video/video.c (grub_video_blit_glyph): Removed. * video/i386/pc/vbe.c (grub_video_vbe_map_rgb): Added 1-bit support. (grub_video_vbe_map_rgba): Likewise. (grub_video_vbe_unmap_color_int): Likewise. (grub_video_vbe_blit_glyph): Removed. (grub_video_vbe_adapter): Removed blit_glyph. * video/i386/pc/vbeutil.c (get_data_ptr): Added 1-bit support. (get_pixel): Likewise. (set_pixel): Likewise. * commands/videotest.c (grub_cmd_videotest): Added more tests for fonts. * term/gfxterm.c: Adapted to new font engine. * term/i386/pc/vesafb.c: Marked as deprecated. Made it compile. * term/i386/pc/vga.c: Likewise. * util/fonttool/src/org/gnu/grub/fonttool/BDFLoader.java: New file. * util/fonttool/src/org/gnu/grub/fonttool/CharDefs.java: Likewise. * util/fonttool/src/org/gnu/grub/fonttool/CharacterRange.java: Likewise. * util/fonttool/src/org/gnu/grub/fonttool/CharacterRange.java: Likewise. * util/fonttool/src/org/gnu/grub/fonttool/Converter.java: Likewise. * util/fonttool/src/org/gnu/grub/fonttool/Font.java: Likewise. * util/fonttool/src/org/gnu/grub/fonttool/Glyph.java: Likewise. * util/fonttool/src/org/gnu/grub/fonttool/PFF2Sections.java: Likewise. * util/fonttool/src/org/gnu/grub/fonttool/PFF2Writer.java: Likewise. * util/grub.d/00_header.in: Changed to use new loadfont command. * util/grub-mkconfig_lib.in: Changed font extension.
This commit is contained in:
chaac
parent
278922e80b
commit
1e901a7573
34 changed files with 2859 additions and 543 deletions
1026
font/font.c
Normal file
1026
font/font.c
Normal file
File diff suppressed because it is too large
Load diff
77
font/font_cmd.c
Normal file
77
font/font_cmd.c
Normal file
|
|
@ -0,0 +1,77 @@
|
|||
/* font_cmd.c - Font command definition. */
|
||||
/*
|
||||
* GRUB -- GRand Unified Bootloader
|
||||
* Copyright (C) 2003,2005,2006,2007,2008,2009 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 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* GRUB 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, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include <grub/font.h>
|
||||
#include <grub/dl.h>
|
||||
#include <grub/normal.h>
|
||||
#include <grub/misc.h>
|
||||
|
||||
static grub_err_t
|
||||
loadfont_command (struct grub_arg_list *state __attribute__ ((unused)),
|
||||
int argc,
|
||||
char **args)
|
||||
{
|
||||
if (argc == 0)
|
||||
return grub_error (GRUB_ERR_BAD_ARGUMENT, "no font specified");
|
||||
|
||||
while (argc--)
|
||||
if (grub_font_load (*args++) != 0)
|
||||
return GRUB_ERR_BAD_FONT;
|
||||
|
||||
return GRUB_ERR_NONE;
|
||||
}
|
||||
|
||||
static grub_err_t
|
||||
lsfonts_command (struct grub_arg_list *state __attribute__ ((unused)),
|
||||
int argc __attribute__ ((unused)),
|
||||
char **args __attribute__ ((unused)))
|
||||
{
|
||||
struct grub_font_node *node;
|
||||
|
||||
grub_printf ("Loaded fonts:\n");
|
||||
for (node = grub_font_list; node; node = node->next)
|
||||
{
|
||||
grub_font_t font = node->value;
|
||||
grub_printf ("%s\n", grub_font_get_name (font));
|
||||
}
|
||||
|
||||
return GRUB_ERR_NONE;
|
||||
}
|
||||
|
||||
GRUB_MOD_INIT(font_manager)
|
||||
{
|
||||
grub_font_loader_init ();
|
||||
|
||||
grub_register_command ("loadfont", loadfont_command, GRUB_COMMAND_FLAG_BOTH,
|
||||
"loadfont FILE...",
|
||||
"Specify one or more font files to load.", 0);
|
||||
|
||||
grub_register_command ("lsfonts", lsfonts_command, GRUB_COMMAND_FLAG_BOTH,
|
||||
"lsfonts",
|
||||
"List the loaded fonts.", 0);
|
||||
}
|
||||
|
||||
GRUB_MOD_FINI(font_manager)
|
||||
{
|
||||
/* TODO: Determine way to free allocated resources.
|
||||
Warning: possible pointer references could be in use. */
|
||||
|
||||
grub_unregister_command ("loadfont");
|
||||
}
|
||||
|
||||
283
font/manager.c
283
font/manager.c
|
|
@ -1,283 +0,0 @@
|
|||
/*
|
||||
* GRUB -- GRand Unified Bootloader
|
||||
* Copyright (C) 2003,2005,2006,2007 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 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* GRUB 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, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#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>
|
||||
#include <grub/bufio.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;
|
||||
|
||||
/* Fill unknown glyph's with rounded question mark. */
|
||||
static grub_uint8_t unknown_glyph[16] =
|
||||
{ /* 76543210 */
|
||||
0x7C, /* ooooo */
|
||||
0x82, /* o o */
|
||||
0xBA, /* o ooo o */
|
||||
0xAA, /* o o o o */
|
||||
0xAA, /* o o o o */
|
||||
0x8A, /* o o o */
|
||||
0x9A, /* o oo o */
|
||||
0x92, /* o o o */
|
||||
0x92, /* o o o */
|
||||
0x92, /* o o o */
|
||||
0x92, /* o o o */
|
||||
0x82, /* o o */
|
||||
0x92, /* o o o */
|
||||
0x82, /* o o */
|
||||
0x7C, /* ooooo */
|
||||
0x00 /* */
|
||||
};
|
||||
|
||||
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_buffile_open (filename, 0);
|
||||
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;
|
||||
const 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;
|
||||
|
||||
/* Use pre-defined pattern to fill unknown glyphs. */
|
||||
for (i = 0; i < 16; i++)
|
||||
glyph->bitmap[i] = unknown_glyph[i];
|
||||
|
||||
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;
|
||||
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 (grub_file_read (font->file, (char *) bitmap, w * 16)
|
||||
!= (grub_ssize_t) w * 16)
|
||||
{
|
||||
remove_font (font);
|
||||
goto restart;
|
||||
}
|
||||
|
||||
/* Fill glyph with information. */
|
||||
grub_memcpy (glyph->bitmap, bitmap, w * 16);
|
||||
|
||||
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");
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue