b1b797cb1b
* commands/blocklist.c: Add include file <grub/command.h>, remove <grub/normal.h> and <grub/arg.h>. (grub_cmd_blocklist): Use the new command interface. (GRUB_MOD_INIT): Likewise. (GRUB_MOD_FINI): Likewise. * commands/boot.c: Likewise. * commands/cat.c: Likewise. * commands/cmp.c: Likewise. * commands/configfile.c: Likewise. * commands/crc.c: Likewise. * commands/echo.c: Likewise. * commands/halt.c: Likewise. * commands/handler.c: Likewise. * commands/hdparm.c: Likewise. * commands/help.c: Likewise. * commands/hexdump.c: Likewise. * commands/loadenv.c: Likewise. * commands/ls.c: Likewise. * commands/lsmmap.c: Likewise. * commands/lspci.c: Likewise. * commands/loadenv.c: Likewise. * commands/read.c: Likewise. * commands/reboot.c: Likewise. * commands/search.c: Likewise. * commands/sleep.c: Likewise. * commands/test.c: Likewise. * commands/usbtest.c: Likewise. * commands/videotest.c: Likewise. * commands/i386/cpuid.c: Likewise. * commands/i386/pc/halt.c: Likewise. * commands/i386/pc/play.c: Likewise. * commands/i386/pc/pxecmd.c: Likewise. * commands/i386/pc/vbeinfo.c: Likewise. * commands/i386/pc/vbetest.c: Likewise. * commands/ieee1275/suspend.c: Likewise. * disk/loopback.c: Likewise. * font/font_cmd.c: Likewise. * hello/hello.c: Likewise. * loader/efi/appleloader.c: Likewise. * loader/efi/chainloader.c: Likewise. * loader/i386/bsd.c: Likewise. * loader/i386/efi/linux.c: Likewise. * loader/i386/ieee1275/linux.c: Likewise. * loader/i386/linux.c: Likewise. * loader/i386/pc/chainloader.c: Likewise. * loader/i386/pc/linux.c: Likewise. * loader/powerpc/ieee1275/linux.c: Likewise. * loader/multiboot_loader.c: Likewise. * term/gfxterm.c: Likewise. * term/i386/pc/serial.c: Likewise. * term/terminfo.c: Likewise. * term/i386/pc/vesafb.c: Removed <grub/arg.h>. * term/i386/pc/vga.c: Likewise. * video/readers/jpeg.c: Likewise. * video/readers/png.c: Likewise. * video/readers/tga.c: Likewise. * util/grub-fstest (cmd_loopback): Removed. (cmd_blocklist): Likewise. (cmd_ls): Likewise. (grub_register_command): Likewise. (grub_unregister_command): Likewise. (execute_command): Use grub_command_find to locate command and execute it. * include/grub/efi/chainloader.h: Removed. * loader/efi/chainloader_normal.c: Likewise. * loader/i386/bsd_normal.c: Likewise. * loader/i386/pc/chainloader_normal.c: Likewise. * loader/i386/pc/multiboot_normal.c: Likewise. * loader/linux_normal.c: Likewise. * loader/multiboot_loader_normal.c: Likewise. * loader/powerpc/ieee1275/linux_normal.c: Likewise. * gencmdlist.sh: Scan new registration command grub_register_extcmd and grub_register_command_p1. * conf/common.rmk (grub_fstest_SOURCES): Add kern/list.c, kern/command.c, lib/arg.c and commands/extcmd.c. (pkglib_MODULES): Remove boot.mod, and minicmd.mod and extcmd.mod. (minicmd_mod_SOURCES): New variable. (minicmd_mod_CFLAGS): Likewise. (minicmd_mod_LDFLAGS): Likewise. (extcmd_mod_SOURCES): Likewise. (extcmd_mod_CFLAGS): Likewise. (extcmd_mod_LDFLAGS): Likewise. (boot_mod_SOURCES): Removed. (boot_mod_CFLAGS): Likewise. (boot_mod_LDFLAGS): Likewise. * conf/i386-pc.rmk (kernel_img_SOURCES): Add kern/command.c and kern/corecmd.c. (kernel_img_HEADERS): Add command.h. (grub_emu_SOURCES): Remove commands/boot.c and normal/arg.c, add commands/minicmd.c, kern/command.c, kern/corecmd.c, commands/extcmd.c and lib/arg.c. (pkglib_MODULES): Change _linux.mod, _chain.mod, _bsd.mod and _multiboot.mod as linux.mod, chain.mod, bsd.mod and multiboot.mod, remove the corresponding normal mode command. (normal_mod_SOURCES): Remove normal/arg.c. * conf/i386-coreboot.rmk: Likewise. * conf/i386-efi.rmk: Likewise. * conf/i386-ieee1275.rmk: Likewise. * conf/powerpc-ieee1275.rmk: Likewise. * conf/x86_64-efi.rmk: Likewise. * include/grub/arg.h: Move from here ... * include/grub/lib/arg.h: ... to here. * normal/arg.c: Move from here ... * lib/arg.c: ... to here. * commands/extcmd.c: New file. * commands/minicmd.c: Likewise. * include/grub/command.h: Likewise. * include/grub/extcmd.h: Likewise. * kern/command.c: Likewise. * kern/corecmd.c: Likewise. * kern/list.c (grub_list_iterate): Return int instead of void. (grub_list_insert): New function. (grub_prio_list_insert): Likewise. * kern/rescue.c (grub_rescue_command): Removed. (grub_rescue_command_list): Likewise. (grub_rescue_register_command): Likewise. (grub_rescue_unregister_command): Likewise. (grub_rescue_cmd_boot): Move to minicmd.c (grub_rescue_cmd_help): Likewise. (grub_rescue_cmd_info): Likewise. (grub_rescue_cmd_boot): Likewise. (grub_rescue_cmd_testload): Likewise. (grub_rescue_cmd_dump): Likewise. (grub_rescue_cmd_rmmod): Likewise. (grub_rescue_cmd_lsmod): Likewise. (grub_rescue_cmd_exit): Likewise. (grub_rescue_print_devices): Moved to corecmd.c. (grub_rescue_print_files): Likewise. (grub_rescue_cmd_ls): Likewise. (grub_rescue_cmd_insmod): Likewise. (grub_rescue_cmd_set): Likewise. (grub_rescue_cmd_unset): Likewise. (attemp_normal_mode): Use grub_command_find to get normal module. (grub_enter_rescue_mode): Use grub_register_core_commands to register commands, remove grub_rescue_regiter_command calls. * normal/command.c (grub_regiser_command): Removed. (grub_unregister_command): Likewise. (grub_command_find): Likewise. (grub_iterate_commands): Likewise. (rescue_command): Likewise. (export_command): Moved to corecmd.c. (set_command): Removed. (unset_command): Likewise. (insmod_command): Likewise. (rmmod_command): Likewise. (lsmod_command): Likewise. (grub_command_init): Likewise. * normal/completion.c (iterate_command): Use cmd->prio to check for active command. (complete_arguments): Use grub_extcmd_t structure to find options. (grub_normal_do_completion): Change function grub_iterate_commands to grub_command_iterate. * normal/execute.c (grub_script_execute_cmd): No need to parse argument here. * normal/main.c (grub_dyncmd_dispatcher): New function. (read_command_list): Register unload commands as dyncmd. (grub_cmd_normal): Use new command interface, register rescue, unregister normal at entry, register normal, unregister rescue at exit. * include/grub/list.h (grub_list_test_t): New type. (grub_list_iterate): Return int instead of void. (grub_list_insert): New function. (GRUB_AS_NAMED_LIST_P): New macro. (GRUB_AS_PRIO_LIST): Likewise. (GRUB_AS_PRIO_LIST_P): Likewise. (GRUB_PRIO_LIST_PRIO_MASK): New constant. (GRUB_PRIO_LIST_FLAG_ACTIVE): Likewise. (grub_prio_list): New structure. (grub_prio_list_insert): New function. (grub_prio_list_remove): New inline function. * include/grub/normal.h: Remove <grub/arg.h>, add <grub/command.h>. (GRUB_COMMAND_FLAG_CMDLINE): Moved to command.h. (GRUB_COMMAND_FLAG_MENU): Likewise. (GRUB_COMMAND_FLAG_BOTH): Likewise. (GRUB_COMMAND_FLAG_TITLE): Likewise. (GRUB_COMMAND_FLAG_NO_ECHO): Likewise. (GRUB_COMMAND_FLAG_NO_ARG_PARSE): Removed. (GRUB_COMMAND_FLAG_NOT_LOADED): Likewise. (grub_command): Likewise. (grub_register_command): Likewise. (grub_command_find): Likewise. (grub_iterate_commands): Likewise. (grub_command_init): Likewise. (grub_arg_parse): Likewise. (grub_arg_show_help): Likewise. * include/grub/rescue.h (grub_rescue_register_command): Removed. (grub_rescue_unregister_command): Likewise. * include/grub/i386/bsd.h: Remove grub_rescue_cmd_freebsd, grub_rescue_cmd_openbsd, grub_rescue_cmd_netbsd, grub_rescue_cmd_freebsd_loadenv and grub_rescue_cmd_freebsd_module. * include/grub/i386/efi/loader.h: Remove grub_rescue_cmd_linux and grub_rescue_cmd_initrd. * include/grub/i386/loader.h: Likewise. * include/grub/x86_64/loader.h: Likewise. * include/grub/i386/pc/chainloader.h: Remove grub_chainloader_cmd.
188 lines
6.3 KiB
C
188 lines
6.3 KiB
C
/*
|
|
* GRUB -- GRand Unified Bootloader
|
|
* Copyright (C) 2006,2007,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/video.h>
|
|
#include <grub/types.h>
|
|
#include <grub/dl.h>
|
|
#include <grub/misc.h>
|
|
#include <grub/mm.h>
|
|
#include <grub/font.h>
|
|
#include <grub/term.h>
|
|
#include <grub/command.h>
|
|
|
|
static grub_err_t
|
|
grub_cmd_videotest (grub_command_t cmd __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_video_color_t color;
|
|
unsigned int x;
|
|
unsigned int y;
|
|
unsigned int width;
|
|
unsigned int height;
|
|
int i;
|
|
grub_font_t sansbig;
|
|
grub_font_t sans;
|
|
grub_font_t sanssmall;
|
|
grub_font_t fixed;
|
|
struct grub_font_glyph *glyph;
|
|
struct grub_video_render_target *text_layer;
|
|
grub_video_color_t palette[16];
|
|
const char *str;
|
|
int texty;
|
|
|
|
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);
|
|
|
|
sansbig = grub_font_get ("Helvetica Bold 24");
|
|
sans = grub_font_get ("Helvetica Bold 14");
|
|
sanssmall = grub_font_get ("Helvetica 8");
|
|
fixed = grub_font_get ("Fixed 20");
|
|
if (! sansbig || ! sans || ! sanssmall || ! fixed)
|
|
return grub_error (GRUB_ERR_BAD_FONT, "No font loaded.");
|
|
|
|
glyph = grub_font_get_glyph (fixed, '*');
|
|
grub_font_draw_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);
|
|
|
|
texty = 32;
|
|
grub_font_draw_string ("The quick brown fox jumped over the lazy dog.",
|
|
sans, color, 16, texty);
|
|
texty += grub_font_get_descent (sans) + grub_font_get_leading (sans);
|
|
|
|
texty += grub_font_get_ascent (fixed);
|
|
grub_font_draw_string ("The quick brown fox jumped over the lazy dog.",
|
|
fixed, color, 16, texty);
|
|
texty += grub_font_get_descent (fixed) + grub_font_get_leading (fixed);
|
|
|
|
/* To convert Unicode characters into UTF-8 for this test, the following
|
|
command is useful:
|
|
echo -ne '\x00\x00\x26\x3A' | iconv -f UTF-32BE -t UTF-8 | od -t x1
|
|
This converts the Unicode character U+263A to UTF-8. */
|
|
|
|
/* Characters used:
|
|
Code point Description UTF-8 encoding
|
|
----------- ------------------------------ --------------
|
|
U+263A unfilled smiley face E2 98 BA
|
|
U+00A1 inverted exclamation point C2 A1
|
|
U+00A3 British pound currency symbol C2 A3
|
|
U+03C4 Greek tau CF 84
|
|
U+00E4 lowercase letter a with umlaut C3 A4
|
|
U+2124 set 'Z' symbol (integers) E2 84 A4
|
|
U+2287 subset symbol E2 8A 87
|
|
U+211D set 'R' symbol (real numbers) E2 84 9D */
|
|
|
|
str =
|
|
"Unicode test: happy\xE2\x98\xBA \xC2\xA3 5.00"
|
|
" \xC2\xA1\xCF\x84\xC3\xA4u! "
|
|
" \xE2\x84\xA4\xE2\x8A\x87\xE2\x84\x9D";
|
|
color = grub_video_map_rgb (128, 128, 255);
|
|
|
|
/* All characters in the string exist in the 'Fixed 20' (10x20) font. */
|
|
texty += grub_font_get_ascent(fixed);
|
|
grub_font_draw_string (str, fixed, color, 16, texty);
|
|
texty += grub_font_get_descent (fixed) + grub_font_get_leading (fixed);
|
|
|
|
/* Some character don't exist in the Helvetica font, so the font engine
|
|
will fall back to using glyphs from another font that does contain them.
|
|
TODO The font engine should be smart about selecting a replacement font
|
|
and prioritize fonts with similar sizes. */
|
|
|
|
texty += grub_font_get_ascent(sansbig);
|
|
grub_font_draw_string (str, sansbig, color, 16, texty);
|
|
texty += grub_font_get_descent (sansbig) + grub_font_get_leading (sansbig);
|
|
|
|
texty += grub_font_get_ascent(sans);
|
|
grub_font_draw_string (str, sans, color, 16, texty);
|
|
texty += grub_font_get_descent (sans) + grub_font_get_leading (sans);
|
|
|
|
texty += grub_font_get_ascent(sanssmall);
|
|
grub_font_draw_string (str, sanssmall, color, 16, texty);
|
|
texty += (grub_font_get_descent (sanssmall)
|
|
+ grub_font_get_leading (sanssmall));
|
|
|
|
glyph = grub_font_get_glyph (fixed, '*');
|
|
|
|
for (i = 0; i < 16; i++)
|
|
{
|
|
color = grub_video_map_color (i);
|
|
palette[i] = color;
|
|
grub_font_draw_glyph (glyph, color, 16 + i * 16, 220);
|
|
}
|
|
|
|
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, GRUB_VIDEO_BLIT_BLEND, 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;
|
|
}
|
|
|
|
static grub_command_t cmd;
|
|
|
|
GRUB_MOD_INIT(videotest)
|
|
{
|
|
cmd = grub_register_command ("videotest", grub_cmd_videotest,
|
|
0, "Test video subsystem");
|
|
}
|
|
|
|
GRUB_MOD_FINI(videotest)
|
|
{
|
|
grub_unregister_command (cmd);
|
|
}
|