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

font preload

Browse source
This commit is contained in:
phcoder 2009-10-24 12:44:42 +02:00
parent 3c842eea9f
commit a9b7a540bd
5 changed files with 114 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

70
font/font_cmd.c
View file

@ -17,10 +17,13 @@
* along with GRUB. If not, see <http://www.gnu.org/licenses/>.
*/
#include <grub/bufio.h>
#include <grub/font.h>
#include <grub/dl.h>
#include <grub/misc.h>
#include <grub/command.h>
#include <grub/kernel.h>
#include <grub/mm.h>
static grub_err_t
loadfont_command (grub_command_t cmd __attribute__ ((unused)),
@ -31,8 +34,16 @@ loadfont_command (grub_command_t cmd __attribute__ ((unused)),
return grub_error (GRUB_ERR_BAD_ARGUMENT, "no font specified");
while (argc--)
if (grub_font_load (*args++) != 0)
return GRUB_ERR_BAD_FONT;
{
grub_file_t file = 0;
file = grub_buffile_open (*args++, 1024);
if (!file)
return grub_errno;
if (grub_font_load (file) != 0)
return GRUB_ERR_BAD_FONT;
}
return GRUB_ERR_NONE;
}
@ -54,12 +65,67 @@ lsfonts_command (grub_command_t cmd __attribute__ ((unused)),
return GRUB_ERR_NONE;
}
static grub_ssize_t
pseudo_file_read (struct grub_file *file, char *buf, grub_size_t len)
{
grub_memcpy (buf, (char *) file->data + file->offset, len);
return len;
}
static grub_err_t
pseudo_file_close (struct grub_file *file)
{
grub_free (file->data);
file->data = 0;
return GRUB_ERR_NONE;
}
/* Filesystem descriptor. */
static struct grub_fs pseudo_fs =
{
.name = "Font Loader",
.read = pseudo_file_read,
.close = pseudo_file_close
};
static int
load_font_module (struct grub_module_header *header)
{
grub_file_t file;
if (header->type != OBJ_TYPE_FONT)
return 0;
file = grub_malloc (sizeof (*file));
file->read_hook = 0;
file->offset = 0;
file->size = header->size - sizeof (struct grub_module_header);
file->data = grub_malloc (header->size - sizeof (struct grub_module_header));
if (!file->data)
return 0;
grub_memcpy (file->data, (char *) header + sizeof (struct grub_module_header),
file->size);
file->device = 0;
file->fs = &pseudo_fs;
grub_font_load (file);
return 0;
}
static grub_command_t cmd_loadfont, cmd_lsfonts;
GRUB_MOD_INIT(font_manager)
{
grub_font_loader_init ();
grub_module_iterate (load_font_module);
cmd_loadfont =
grub_register_command ("loadfont", loadfont_command,
"loadfont FILE...",