db1771cfbe
* commands/boot.c: New file. * commands/cat.c: Likewise. * commands/cmp.c: Likewise. * commands/ls.c: Likewise. * commands/terminal.c: Likewise. * normal/command.c: Include <pupa/env.h> and <pupa/dl.h>. (pupa_register_command): Changed interface to match the new argument parser. (pupa_command_execute): Changed (almost rewritten) so it uses pupa_split_command. Added support for setting variables using the syntax `foo=bar'. (rescue_command): Changed to work with the new argument parser. (terminal_command): Moved from here to commands/terminal.c. (set_command): New function. (unset_command): New function. (insmod_command): New function. (rmmod_command): New function. (lsmod_command): New function. (pupa_command_init): Don't initialize the command terminal anymore. Initialize the commands set, unset, insmod, rmmod and lsmod. * conf/i386-pc.rmk (kernel_img_SOURCES): Add kern/env.c. (kernel_img_HEADERS): Add arg.h and env.h. (pupa_mkimage_LDFLAGS): Add kern/env.c. (pupa_emu_SOURCES): Add kern/env.c, commands/ls.c, commands/terminal.c commands/boot.c commands/cmp.c commands/cat.c, normal/arg.c. (pkgdata_MODULES): Add ls.mod, boot.mod, cmp.mod, cat.mod and terminal.mod. (normal_mod_SOURCES): Add normal/arg.c and normal/arg.c. (boot_mod_SOURCES): New variable. (terminal_mod_SOURCES): Likewise. (ls_mod_SOURCES): Likewise. (cmp_mod_SOURCES): Likewise. (cat_mod_SOURCES): Likewise. * normal/arg.c: New file. * kern/env.c: Likewise. * include/pupa/arg.h: Likewise. * include/pupa/env.h: Likewise. * font/manager.c (font_command): Changed to match argument parsing interface changes. (PUPA_MOD_INIT): Likewise. * hello/hello.c (pupa_cmd_hello): Likewise. (PUPA_MOD_INIT): Likewise. * include/pupa/disk.h: Include <pupa/device.h>. (pupa_print_partinfo): New prototype. * include/pupa/dl.h (pupa_dl_set_prefix): Prototype removed. (pupa_dl_get_prefix): Likewise. * include/pupa/misc.h: Include <pupa/err.h>. (pupa_isgraph): New prototype. (pupa_isdigit): Likewise. (pupa_split_cmdline): Likewise. * include/pupa/normal.h: Include <pupa/arg.h>. (pupa_command): Changed the prototype of the member `func' to match the argument parsing interface. Added member `options'. (pupa_register_command): Updated to match function. (pupa_arg_parse): New prototype. (pupa_hello_init) [PUPA_UTIL]: New prototype. (pupa_hello_fini) [PUPA_UTIL]: Likewise. (pupa_ls_init) [PUPA_UTIL]: Likewise. (pupa_ls_fini) [PUPA_UTIL]: Likewise. (pupa_cat_init) [PUPA_UTIL]: Likewise. (pupa_cat_fini) [PUPA_UTIL]: Likewise. (pupa_boot_init) [PUPA_UTIL]: Likewise. (pupa_boot_fini) [PUPA_UTIL]: Likewise. (pupa_cmp_init) [PUPA_UTIL]: Likewise. (pupa_cmp_fini) [PUPA_UTIL]: Likewise. (pupa_terminal_init) [PUPA_UTIL]: Likewise. (pupa_terminal_fini) [PUPA_UTIL]: Likewise. * kern/disk.c: Include <pupa/file.h>. (pupa_print_partinfo): New function. * kern/dl.c: Include <pupa/env.h>. (pupa_dl_dir): Variable removed. (pupa_dl_load): Use the environment variable `prefix' instead of the variable pupa_dl_dir. (pupa_dl_set_prefix): Function removed. (pupa_dl_get_prefix): Likewise. * kern/i386/pc/init.c: Include <pupa/env.h>. (pupa_machine_init): Use the environment variable `prefix' instead of using pupa_dl_set_prefix to set the prefix. * kern/main.c: Include <pupa/env.h>. (pupa_set_root_dev): Use the environment variable `prefix' instead of using pupa_dl_get_prefix to get the prefix. * kern/misc.c: Include <pupa/env.h>. (pupa_isdigit): New function. (pupa_isgraph): Likewise. (pupa_ftoa): Likewise. (pupa_vsprintf): Added support for printing values of the type `double'. Make it possible to format variable output when using formatting like `%1.2%f'. (pupa_split_cmdline): New function. * kern/rescue.c: Include <pupa/env.h>. (next_word): Removed function. (pupa_rescue_cmd_prefix): Likewise. (pupa_rescue_cmd_set): New function. (pupa_rescue_cmd_unset): New function. (pupa_enter_rescue_mode): Use the `pupa_split_cmdline' function to split the command line instead of splitting it here. Added support for setting variables using the syntax `foo=bar'. Don't initialize the prefix command anymore. Initialized the set and unset commands. * normal/cmdline.c: Include <pupa/env.h>. (pupa_tab_complete): Added prototypes for print_simple_completion, print_partition_completion, add_completion, iterate_commands, iterate_dev, iterate_part and iterate_dir. Moved code to print partition information from here to kern/disk.c. (pupa_cmdline_run): Don't check if the funtion exists anymore. * normal/main.c: Include <pupa/env.h>. (pupa_rescue_cmd_normal): Use the environment variable `prefix' instead of using pupa_dl_get_prefix to get the prefix. * term/i386/pc/vga.c: Include <pupa/arg.h>. (check_vga_mem): Cast pointers to `void *' to silence a gcc warning. (pupa_vga_putchar) [! DEBUG_VGA]: Removed for this case. (pupa_vga_setcolor): Declare unused variables with `__attribute__ ((unused))' to silence a gcc warning. (pupa_vga_setcolor): Likewise. (debug_command): Changed to match argument parsing interface changes. * util/pupa-emu.c: Include <pupa/env.h>. (options): Added 0's for unused fields to silence a gcc warning. (argp): Likewise. (main): Use the environment variable `prefix' instead of using pupa_dl_set_prefix to set the prefix. Initialize the commands ls, boot, cmp, cat and terminal. Finish the commands boot, cmp, cat and terminal. * util/i386/pc/getroot.c: Include <pupa/i386/pc/util/biosdisk.h>. * util/misc.c: Include <malloc.h>. (pupa_malloc): Rewritten so errors are correctly reported. (pupa_realloc): Likewise. (pupa_memalign): Likewise. (pupa_mm_init_region): Declare unused variables with `__attribute__ ((unused))' to silence a gcc warning. * normal/i386/setjmp.S: Remove tab at the end of the file to silence a gcc warning. * loader/i386/pc/linux.c (pupa_rescue_cmd_initrd): Declare unused variables with `__attribute__ ((unused))' to silence a gcc warning. * loader/i386/pc/multiboot.c (pupa_multiboot_unload): Make the local variable i unsigned to silence a gcc warning. * kern/term.c: Include <pupa/misc.h>. (pupa_more_lines): New variable. (pupa_more): Likewise. (pupa_putcode): When the pager is active pause at the end of every screen. (pupa_set_more): New function. * include/pupa/term.h (pupa_set_more): New prototype.
245 lines
5.1 KiB
C
245 lines
5.1 KiB
C
/*
|
|
* PUPA -- Preliminary Universal Programming Architecture for GRUB
|
|
* Copyright (C) 2003 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 <pupa/file.h>
|
|
#include <pupa/misc.h>
|
|
#include <pupa/dl.h>
|
|
#include <pupa/normal.h>
|
|
#include <pupa/types.h>
|
|
#include <pupa/mm.h>
|
|
#include <pupa/font.h>
|
|
|
|
struct entry
|
|
{
|
|
pupa_uint32_t code;
|
|
pupa_uint32_t offset;
|
|
};
|
|
|
|
struct font
|
|
{
|
|
struct font *next;
|
|
pupa_file_t file;
|
|
pupa_uint32_t num;
|
|
struct entry table[0];
|
|
};
|
|
|
|
static struct font *font_list;
|
|
|
|
static int
|
|
add_font (const char *filename)
|
|
{
|
|
pupa_file_t file = 0;
|
|
char magic[4];
|
|
pupa_uint32_t num, i;
|
|
struct font *font = 0;
|
|
|
|
file = pupa_file_open (filename);
|
|
if (! file)
|
|
goto fail;
|
|
|
|
if (pupa_file_read (file, magic, 4) != 4)
|
|
goto fail;
|
|
|
|
if (pupa_memcmp (magic, PUPA_FONT_MAGIC, 4) != 0)
|
|
{
|
|
pupa_error (PUPA_ERR_BAD_FONT, "invalid font magic");
|
|
goto fail;
|
|
}
|
|
|
|
if (pupa_file_read (file, (char *) &num, 4) != 4)
|
|
goto fail;
|
|
|
|
num = pupa_le_to_cpu32 (num);
|
|
font = (struct font *) pupa_malloc (sizeof (struct font)
|
|
+ sizeof (struct entry) * num);
|
|
if (! font)
|
|
goto fail;
|
|
|
|
font->file = file;
|
|
font->num = num;
|
|
|
|
for (i = 0; i < num; i++)
|
|
{
|
|
pupa_uint32_t code, offset;
|
|
|
|
if (pupa_file_read (file, (char *) &code, 4) != 4)
|
|
goto fail;
|
|
|
|
if (pupa_file_read (file, (char *) &offset, 4) != 4)
|
|
goto fail;
|
|
|
|
font->table[i].code = pupa_le_to_cpu32 (code);
|
|
font->table[i].offset = pupa_le_to_cpu32 (offset);
|
|
}
|
|
|
|
font->next = font_list;
|
|
font_list = font;
|
|
|
|
return 1;
|
|
|
|
fail:
|
|
if (font)
|
|
pupa_free (font);
|
|
|
|
if (file)
|
|
pupa_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;
|
|
|
|
pupa_file_close (font->file);
|
|
pupa_free (font);
|
|
|
|
break;
|
|
}
|
|
}
|
|
|
|
/* Return the offset of the glyph corresponding to the codepoint CODE
|
|
in the font FONT. If no found, return zero. */
|
|
static pupa_uint32_t
|
|
find_glyph (const struct font *font, pupa_uint32_t code)
|
|
{
|
|
pupa_uint32_t start = 0;
|
|
pupa_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)
|
|
{
|
|
pupa_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 (unsigned char bitmap[32], unsigned *width)
|
|
{
|
|
if (bitmap)
|
|
{
|
|
unsigned i;
|
|
|
|
for (i = 0; i < 16; i++)
|
|
bitmap[i] = (i & 1) ? 0x55 : 0xaa;
|
|
}
|
|
|
|
*width = 1;
|
|
}
|
|
|
|
/* Get a glyph corresponding to the codepoint CODE. Always fill BITMAP
|
|
and WIDTH with something, even if no glyph is found. */
|
|
int
|
|
pupa_font_get_glyph (pupa_uint32_t code,
|
|
unsigned char bitmap[32], unsigned *width)
|
|
{
|
|
struct font *font;
|
|
|
|
/* FIXME: It is necessary to cache glyphs! */
|
|
|
|
restart:
|
|
for (font = font_list; font; font = font->next)
|
|
{
|
|
pupa_uint32_t offset;
|
|
|
|
offset = find_glyph (font, code);
|
|
if (offset)
|
|
{
|
|
pupa_uint32_t w;
|
|
|
|
pupa_file_seek (font->file, offset);
|
|
if (pupa_file_read (font->file, (char *) &w, 4) != 4)
|
|
{
|
|
remove_font (font);
|
|
goto restart;
|
|
}
|
|
|
|
w = pupa_le_to_cpu32 (w);
|
|
if (w != 1 && w != 2)
|
|
{
|
|
/* pupa_error (PUPA_ERR_BAD_FONT, "invalid width"); */
|
|
remove_font (font);
|
|
goto restart;
|
|
}
|
|
|
|
if (bitmap
|
|
&& (pupa_file_read (font->file, bitmap, w * 16)
|
|
!= (pupa_ssize_t) w * 16))
|
|
{
|
|
remove_font (font);
|
|
goto restart;
|
|
}
|
|
|
|
*width = w;
|
|
return 1;
|
|
}
|
|
}
|
|
|
|
/* Uggh... No font was found. */
|
|
fill_with_default_glyph (bitmap, width);
|
|
return 0;
|
|
}
|
|
|
|
static pupa_err_t
|
|
font_command (struct pupa_arg_list *state __attribute__ ((unused)),
|
|
int argc __attribute__ ((unused)),
|
|
char **args __attribute__ ((unused)))
|
|
{
|
|
if (argc == 0)
|
|
return pupa_error (PUPA_ERR_BAD_ARGUMENT, "no font specified");
|
|
|
|
while (argc--)
|
|
if (! add_font (*args++))
|
|
return 1;
|
|
|
|
return 0;
|
|
}
|
|
|
|
PUPA_MOD_INIT
|
|
{
|
|
(void) mod; /* Stop warning. */
|
|
pupa_register_command ("font", font_command, PUPA_COMMAND_FLAG_BOTH,
|
|
"font FILE...", "Specify a font file to display.", 0);
|
|
}
|
|
|
|
PUPA_MOD_FINI
|
|
{
|
|
pupa_unregister_command ("font");
|
|
}
|