2006-03-14 19:08:34 +00:00
|
|
|
/*
|
|
|
|
* GRUB -- GRand Unified Bootloader
|
2009-01-02 15:26:06 +00:00
|
|
|
* Copyright (C) 2006,2007,2008,2009 Free Software Foundation, Inc.
|
2006-03-14 19:08:34 +00:00
|
|
|
*
|
2007-07-21 23:32:33 +00:00
|
|
|
* GRUB is free software: you can redistribute it and/or modify
|
2006-03-14 19:08:34 +00:00
|
|
|
* it under the terms of the GNU General Public License as published by
|
2007-07-21 23:32:33 +00:00
|
|
|
* the Free Software Foundation, either version 3 of the License, or
|
2006-03-14 19:08:34 +00:00
|
|
|
* (at your option) any later version.
|
|
|
|
*
|
2007-07-21 23:32:33 +00:00
|
|
|
* GRUB is distributed in the hope that it will be useful,
|
2006-03-14 19:08:34 +00:00
|
|
|
* 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
|
2007-07-21 23:32:33 +00:00
|
|
|
* along with GRUB. If not, see <http://www.gnu.org/licenses/>.
|
2006-03-14 19:08:34 +00:00
|
|
|
*/
|
|
|
|
|
|
|
|
#include <grub/term.h>
|
|
|
|
#include <grub/types.h>
|
|
|
|
#include <grub/dl.h>
|
|
|
|
#include <grub/misc.h>
|
|
|
|
#include <grub/font.h>
|
|
|
|
#include <grub/mm.h>
|
|
|
|
#include <grub/env.h>
|
|
|
|
#include <grub/video.h>
|
2009-11-14 23:03:03 +00:00
|
|
|
#include <grub/gfxterm.h>
|
2008-01-01 12:02:07 +00:00
|
|
|
#include <grub/bitmap.h>
|
2009-03-21 Bean <bean123ch@gmail.com>
* 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.
2009-03-21 08:39:59 +00:00
|
|
|
#include <grub/command.h>
|
2009-11-20 09:46:30 +00:00
|
|
|
#include <grub/extcmd.h>
|
|
|
|
#include <grub/bitmap_scale.h>
|
2006-03-14 19:08:34 +00:00
|
|
|
|
2010-01-18 20:51:35 +00:00
|
|
|
#define DEFAULT_VIDEO_MODE "auto"
|
2006-03-14 19:08:34 +00:00
|
|
|
#define DEFAULT_BORDER_WIDTH 10
|
|
|
|
|
2008-01-01 12:02:07 +00:00
|
|
|
#define DEFAULT_STANDARD_COLOR 0x07
|
|
|
|
#define DEFAULT_NORMAL_COLOR 0x07
|
|
|
|
#define DEFAULT_HIGHLIGHT_COLOR 0x70
|
2006-03-14 19:08:34 +00:00
|
|
|
|
|
|
|
struct grub_dirty_region
|
|
|
|
{
|
|
|
|
int top_left_x;
|
|
|
|
int top_left_y;
|
|
|
|
int bottom_right_x;
|
|
|
|
int bottom_right_y;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct grub_colored_char
|
|
|
|
{
|
|
|
|
/* An Unicode codepoint. */
|
2010-03-15 20:14:11 +00:00
|
|
|
struct grub_unicode_glyph *code;
|
2006-03-14 19:08:34 +00:00
|
|
|
|
|
|
|
/* Color values. */
|
|
|
|
grub_video_color_t fg_color;
|
|
|
|
grub_video_color_t bg_color;
|
|
|
|
|
|
|
|
/* The width of this character minus one. */
|
|
|
|
unsigned char width;
|
|
|
|
|
|
|
|
/* The column index of this character. */
|
|
|
|
unsigned char index;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct grub_virtual_screen
|
|
|
|
{
|
2009-01-02 15:26:06 +00:00
|
|
|
/* Dimensions of the virtual screen in pixels. */
|
2006-03-14 19:08:34 +00:00
|
|
|
unsigned int width;
|
|
|
|
unsigned int height;
|
|
|
|
|
2009-01-02 15:26:06 +00:00
|
|
|
/* Offset in the display in pixels. */
|
2006-03-14 19:08:34 +00:00
|
|
|
unsigned int offset_x;
|
|
|
|
unsigned int offset_y;
|
|
|
|
|
2009-01-02 15:26:06 +00:00
|
|
|
/* TTY Character sizes in pixes. */
|
|
|
|
unsigned int normal_char_width;
|
|
|
|
unsigned int normal_char_height;
|
2006-03-14 19:08:34 +00:00
|
|
|
|
2009-01-02 15:26:06 +00:00
|
|
|
/* Virtual screen TTY size in characters. */
|
2006-03-14 19:08:34 +00:00
|
|
|
unsigned int columns;
|
|
|
|
unsigned int rows;
|
|
|
|
|
2009-01-02 15:26:06 +00:00
|
|
|
/* Current cursor location in characters. */
|
2006-03-14 19:08:34 +00:00
|
|
|
unsigned int cursor_x;
|
|
|
|
unsigned int cursor_y;
|
2009-01-02 15:26:06 +00:00
|
|
|
|
|
|
|
/* Current cursor state. */
|
2006-03-14 19:08:34 +00:00
|
|
|
int cursor_state;
|
2006-07-31 14:21:36 +00:00
|
|
|
|
2009-01-02 15:26:06 +00:00
|
|
|
/* Font settings. */
|
|
|
|
grub_font_t font;
|
|
|
|
|
2008-01-01 12:02:07 +00:00
|
|
|
/* Terminal color settings. */
|
|
|
|
grub_uint8_t standard_color_setting;
|
|
|
|
grub_uint8_t normal_color_setting;
|
|
|
|
grub_uint8_t highlight_color_setting;
|
|
|
|
grub_uint8_t term_color;
|
2009-06-10 21:04:23 +00:00
|
|
|
|
2006-03-14 19:08:34 +00:00
|
|
|
/* Color settings. */
|
|
|
|
grub_video_color_t fg_color;
|
|
|
|
grub_video_color_t bg_color;
|
2009-10-24 19:01:27 +00:00
|
|
|
grub_video_color_t bg_color_display;
|
2006-03-14 19:08:34 +00:00
|
|
|
|
|
|
|
/* Text buffer for virtual screen. Contains (columns * rows) number
|
|
|
|
of entries. */
|
|
|
|
struct grub_colored_char *text_buffer;
|
2009-11-30 11:51:20 +00:00
|
|
|
|
|
|
|
int total_scroll;
|
2006-03-14 19:08:34 +00:00
|
|
|
};
|
|
|
|
|
2009-11-14 23:03:03 +00:00
|
|
|
struct grub_gfxterm_window
|
|
|
|
{
|
|
|
|
unsigned x;
|
|
|
|
unsigned y;
|
|
|
|
unsigned width;
|
|
|
|
unsigned height;
|
|
|
|
int double_repaint;
|
2006-03-14 19:08:34 +00:00
|
|
|
};
|
|
|
|
|
2009-11-14 23:03:03 +00:00
|
|
|
static struct grub_video_render_target *render_target;
|
2009-12-26 15:41:54 +00:00
|
|
|
void (*grub_gfxterm_decorator_hook) (void) = NULL;
|
2009-11-14 23:03:03 +00:00
|
|
|
static struct grub_gfxterm_window window;
|
2006-03-14 19:08:34 +00:00
|
|
|
static struct grub_virtual_screen virtual_screen;
|
2009-11-14 23:03:03 +00:00
|
|
|
static grub_gfxterm_repaint_callback_t repaint_callback;
|
2009-12-26 15:41:54 +00:00
|
|
|
static int repaint_schedulded = 0;
|
|
|
|
static int repaint_was_schedulded = 0;
|
2006-03-14 19:08:34 +00:00
|
|
|
|
2009-11-14 23:03:03 +00:00
|
|
|
static void destroy_window (void);
|
2006-03-14 19:08:34 +00:00
|
|
|
|
|
|
|
static struct grub_video_render_target *text_layer;
|
|
|
|
|
2008-01-01 12:02:07 +00:00
|
|
|
static unsigned int bitmap_width;
|
|
|
|
static unsigned int bitmap_height;
|
|
|
|
static struct grub_video_bitmap *bitmap;
|
|
|
|
|
2006-03-14 19:08:34 +00:00
|
|
|
static struct grub_dirty_region dirty_region;
|
|
|
|
|
|
|
|
static void dirty_region_reset (void);
|
|
|
|
|
|
|
|
static int dirty_region_is_empty (void);
|
|
|
|
|
2009-06-10 21:04:23 +00:00
|
|
|
static void dirty_region_add (int x, int y,
|
2006-03-14 19:08:34 +00:00
|
|
|
unsigned int width, unsigned int height);
|
|
|
|
|
2009-01-02 15:26:06 +00:00
|
|
|
static unsigned int calculate_normal_character_width (grub_font_t font);
|
|
|
|
|
|
|
|
static unsigned char calculate_character_width (struct grub_font_glyph *glyph);
|
|
|
|
|
2009-11-14 16:00:39 +00:00
|
|
|
static void grub_gfxterm_refresh (void);
|
|
|
|
|
2010-03-15 20:14:11 +00:00
|
|
|
static grub_ssize_t
|
|
|
|
grub_gfxterm_getcharwidth (const struct grub_unicode_glyph *c);
|
|
|
|
|
2008-01-01 12:02:07 +00:00
|
|
|
static void
|
|
|
|
set_term_color (grub_uint8_t term_color)
|
|
|
|
{
|
|
|
|
struct grub_video_render_target *old_target;
|
|
|
|
|
|
|
|
/* Save previous target and switch to text layer. */
|
|
|
|
grub_video_get_active_render_target (&old_target);
|
|
|
|
grub_video_set_active_render_target (text_layer);
|
|
|
|
|
|
|
|
/* Map terminal color to text layer compatible video colors. */
|
|
|
|
virtual_screen.fg_color = grub_video_map_color(term_color & 0x0f);
|
2009-06-10 21:04:23 +00:00
|
|
|
|
2008-01-01 12:02:07 +00:00
|
|
|
/* Special case: use black as transparent color. */
|
|
|
|
if (((term_color >> 4) & 0x0f) == 0)
|
|
|
|
{
|
|
|
|
virtual_screen.bg_color = grub_video_map_rgba(0, 0, 0, 0);
|
2009-06-10 21:04:23 +00:00
|
|
|
}
|
2008-01-01 12:02:07 +00:00
|
|
|
else
|
|
|
|
{
|
|
|
|
virtual_screen.bg_color = grub_video_map_color((term_color >> 4) & 0x0f);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Restore previous target. */
|
|
|
|
grub_video_set_active_render_target (old_target);
|
|
|
|
}
|
|
|
|
|
2009-07-29 22:12:00 +00:00
|
|
|
static void
|
|
|
|
clear_char (struct grub_colored_char *c)
|
|
|
|
{
|
2010-03-15 20:14:11 +00:00
|
|
|
grub_free (c->code);
|
|
|
|
c->code = grub_unicode_glyph_from_code (' ');
|
|
|
|
if (!c->code)
|
|
|
|
grub_errno = GRUB_ERR_NONE;
|
2009-07-29 22:12:00 +00:00
|
|
|
c->fg_color = virtual_screen.fg_color;
|
|
|
|
c->bg_color = virtual_screen.bg_color;
|
|
|
|
c->width = 0;
|
|
|
|
c->index = 0;
|
|
|
|
}
|
|
|
|
|
2006-03-14 19:08:34 +00:00
|
|
|
static void
|
|
|
|
grub_virtual_screen_free (void)
|
|
|
|
{
|
|
|
|
/* If virtual screen has been allocated, free it. */
|
|
|
|
if (virtual_screen.text_buffer != 0)
|
|
|
|
grub_free (virtual_screen.text_buffer);
|
|
|
|
|
|
|
|
/* Reset virtual screen data. */
|
|
|
|
grub_memset (&virtual_screen, 0, sizeof (virtual_screen));
|
2006-07-31 14:21:36 +00:00
|
|
|
|
2006-03-14 19:08:34 +00:00
|
|
|
/* Free render targets. */
|
|
|
|
grub_video_delete_render_target (text_layer);
|
|
|
|
text_layer = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static grub_err_t
|
|
|
|
grub_virtual_screen_setup (unsigned int x, unsigned int y,
|
2009-01-02 15:26:06 +00:00
|
|
|
unsigned int width, unsigned int height,
|
|
|
|
const char *font_name)
|
2006-03-14 19:08:34 +00:00
|
|
|
{
|
2009-07-20 16:46:36 +00:00
|
|
|
unsigned int i;
|
|
|
|
|
2006-03-14 19:08:34 +00:00
|
|
|
/* Free old virtual screen. */
|
|
|
|
grub_virtual_screen_free ();
|
|
|
|
|
|
|
|
/* Initialize with default data. */
|
2009-01-02 15:26:06 +00:00
|
|
|
virtual_screen.font = grub_font_get (font_name);
|
|
|
|
if (!virtual_screen.font)
|
|
|
|
return grub_error (GRUB_ERR_BAD_FONT,
|
2009-12-24 22:53:05 +00:00
|
|
|
"no font loaded");
|
2006-03-14 19:08:34 +00:00
|
|
|
virtual_screen.width = width;
|
|
|
|
virtual_screen.height = height;
|
|
|
|
virtual_screen.offset_x = x;
|
|
|
|
virtual_screen.offset_y = y;
|
2009-01-02 15:26:06 +00:00
|
|
|
virtual_screen.normal_char_width =
|
|
|
|
calculate_normal_character_width (virtual_screen.font);
|
|
|
|
virtual_screen.normal_char_height =
|
|
|
|
grub_font_get_max_char_height (virtual_screen.font);
|
2006-03-14 19:08:34 +00:00
|
|
|
virtual_screen.cursor_x = 0;
|
|
|
|
virtual_screen.cursor_y = 0;
|
|
|
|
virtual_screen.cursor_state = 1;
|
2009-11-30 11:51:20 +00:00
|
|
|
virtual_screen.total_scroll = 0;
|
2006-03-14 19:08:34 +00:00
|
|
|
|
|
|
|
/* Calculate size of text buffer. */
|
2009-01-02 15:26:06 +00:00
|
|
|
virtual_screen.columns = virtual_screen.width / virtual_screen.normal_char_width;
|
|
|
|
virtual_screen.rows = virtual_screen.height / virtual_screen.normal_char_height;
|
2006-03-14 19:08:34 +00:00
|
|
|
|
|
|
|
/* Allocate memory for text buffer. */
|
|
|
|
virtual_screen.text_buffer =
|
|
|
|
(struct grub_colored_char *) grub_malloc (virtual_screen.columns
|
2006-07-31 14:21:36 +00:00
|
|
|
* virtual_screen.rows
|
|
|
|
* sizeof (*virtual_screen.text_buffer));
|
2006-03-14 19:08:34 +00:00
|
|
|
if (grub_errno != GRUB_ERR_NONE)
|
|
|
|
return grub_errno;
|
|
|
|
|
|
|
|
/* Create new render target for text layer. */
|
|
|
|
grub_video_create_render_target (&text_layer,
|
|
|
|
virtual_screen.width,
|
|
|
|
virtual_screen.height,
|
|
|
|
GRUB_VIDEO_MODE_TYPE_RGB
|
|
|
|
| GRUB_VIDEO_MODE_TYPE_ALPHA);
|
|
|
|
if (grub_errno != GRUB_ERR_NONE)
|
|
|
|
return grub_errno;
|
2006-07-31 14:21:36 +00:00
|
|
|
|
2006-03-14 19:08:34 +00:00
|
|
|
/* As we want to have colors compatible with rendering target,
|
2006-07-31 14:21:36 +00:00
|
|
|
we can only have those after mode is initialized. */
|
2006-03-14 19:08:34 +00:00
|
|
|
grub_video_set_active_render_target (text_layer);
|
2006-07-31 14:21:36 +00:00
|
|
|
|
2008-01-01 12:02:07 +00:00
|
|
|
virtual_screen.standard_color_setting = DEFAULT_STANDARD_COLOR;
|
|
|
|
virtual_screen.normal_color_setting = DEFAULT_NORMAL_COLOR;
|
|
|
|
virtual_screen.highlight_color_setting = DEFAULT_HIGHLIGHT_COLOR;
|
2009-06-10 21:04:23 +00:00
|
|
|
|
2008-01-01 12:02:07 +00:00
|
|
|
virtual_screen.term_color = virtual_screen.normal_color_setting;
|
2009-06-10 21:04:23 +00:00
|
|
|
|
2008-01-01 12:02:07 +00:00
|
|
|
set_term_color (virtual_screen.term_color);
|
|
|
|
|
2009-11-14 23:03:03 +00:00
|
|
|
grub_video_set_active_render_target (render_target);
|
2006-07-31 14:21:36 +00:00
|
|
|
|
2009-10-24 19:01:27 +00:00
|
|
|
virtual_screen.bg_color_display = grub_video_map_rgba(0, 0, 0, 0);
|
2006-07-31 14:21:36 +00:00
|
|
|
|
2009-07-20 16:46:36 +00:00
|
|
|
/* Clear out text buffer. */
|
2009-07-29 22:12:00 +00:00
|
|
|
for (i = 0; i < virtual_screen.columns * virtual_screen.rows; i++)
|
2010-03-15 20:14:11 +00:00
|
|
|
{
|
|
|
|
virtual_screen.text_buffer[i].code = 0;
|
|
|
|
clear_char (&(virtual_screen.text_buffer[i]));
|
|
|
|
}
|
2009-07-20 16:46:36 +00:00
|
|
|
|
2006-03-14 19:08:34 +00:00
|
|
|
return grub_errno;
|
|
|
|
}
|
|
|
|
|
2009-12-26 15:41:54 +00:00
|
|
|
void
|
|
|
|
grub_gfxterm_schedule_repaint (void)
|
2009-06-04 18:22:45 +00:00
|
|
|
{
|
2009-12-26 15:41:54 +00:00
|
|
|
repaint_schedulded = 1;
|
2009-06-04 18:22:45 +00:00
|
|
|
}
|
|
|
|
|
2009-12-26 15:41:54 +00:00
|
|
|
grub_err_t
|
|
|
|
grub_gfxterm_set_window (struct grub_video_render_target *target,
|
|
|
|
int x, int y, int width, int height,
|
|
|
|
int double_repaint,
|
|
|
|
const char *font_name, int border_width)
|
2006-03-14 19:08:34 +00:00
|
|
|
{
|
2009-11-14 23:03:03 +00:00
|
|
|
/* Clean up any prior instance. */
|
|
|
|
destroy_window ();
|
2006-07-31 14:21:36 +00:00
|
|
|
|
2009-11-14 23:03:03 +00:00
|
|
|
/* Set the render target. */
|
|
|
|
render_target = target;
|
2009-01-02 15:26:06 +00:00
|
|
|
|
2009-11-14 23:03:03 +00:00
|
|
|
/* Create virtual screen. */
|
|
|
|
if (grub_virtual_screen_setup (border_width, border_width,
|
|
|
|
width - 2 * border_width,
|
|
|
|
height - 2 * border_width,
|
|
|
|
font_name)
|
|
|
|
!= GRUB_ERR_NONE)
|
2007-06-10 17:31:03 +00:00
|
|
|
{
|
2009-11-14 23:03:03 +00:00
|
|
|
return grub_errno;
|
2007-06-10 17:31:03 +00:00
|
|
|
}
|
2006-03-14 19:08:34 +00:00
|
|
|
|
2009-11-14 23:03:03 +00:00
|
|
|
/* Set window bounds. */
|
|
|
|
window.x = x;
|
|
|
|
window.y = y;
|
|
|
|
window.width = width;
|
|
|
|
window.height = height;
|
|
|
|
window.double_repaint = double_repaint;
|
|
|
|
|
|
|
|
dirty_region_reset ();
|
2009-12-26 15:41:54 +00:00
|
|
|
grub_gfxterm_schedule_repaint ();
|
2009-11-14 23:03:03 +00:00
|
|
|
|
|
|
|
return grub_errno;
|
|
|
|
}
|
|
|
|
|
|
|
|
grub_err_t
|
2009-12-26 15:41:54 +00:00
|
|
|
grub_gfxterm_fullscreen (void)
|
2006-03-14 19:08:34 +00:00
|
|
|
{
|
2009-11-14 23:03:03 +00:00
|
|
|
const char *font_name;
|
|
|
|
struct grub_video_mode_info mode_info;
|
2009-11-20 13:30:58 +00:00
|
|
|
grub_video_color_t color;
|
2009-12-26 15:41:54 +00:00
|
|
|
grub_err_t err;
|
2010-01-06 09:51:23 +00:00
|
|
|
int double_redraw;
|
2009-06-04 18:22:45 +00:00
|
|
|
|
|
|
|
err = grub_video_get_info (&mode_info);
|
|
|
|
/* Figure out what mode we ended up. */
|
|
|
|
if (err)
|
|
|
|
return err;
|
|
|
|
|
2009-12-26 15:41:54 +00:00
|
|
|
grub_video_set_active_render_target (GRUB_VIDEO_RENDER_TARGET_DISPLAY);
|
|
|
|
|
2010-01-06 09:51:23 +00:00
|
|
|
double_redraw = mode_info.mode_type & GRUB_VIDEO_MODE_TYPE_DOUBLE_BUFFERED
|
|
|
|
&& !(mode_info.mode_type & GRUB_VIDEO_MODE_TYPE_UPDATING_SWAP);
|
|
|
|
|
2006-03-14 19:08:34 +00:00
|
|
|
/* Make sure screen is black. */
|
|
|
|
color = grub_video_map_rgb (0, 0, 0);
|
|
|
|
grub_video_fill_rect (color, 0, 0, mode_info.width, mode_info.height);
|
2010-01-06 09:51:23 +00:00
|
|
|
if (double_redraw)
|
|
|
|
{
|
|
|
|
grub_video_swap_buffers ();
|
|
|
|
grub_video_fill_rect (color, 0, 0, mode_info.width, mode_info.height);
|
|
|
|
}
|
2008-01-01 12:02:07 +00:00
|
|
|
bitmap = 0;
|
2006-03-14 19:08:34 +00:00
|
|
|
|
2009-11-14 23:03:03 +00:00
|
|
|
/* Select the font to use. */
|
2009-01-02 15:26:06 +00:00
|
|
|
font_name = grub_env_get ("gfxterm_font");
|
|
|
|
if (! font_name)
|
2009-11-14 23:03:03 +00:00
|
|
|
font_name = ""; /* Allow fallback to any font. */
|
2006-07-31 14:21:36 +00:00
|
|
|
|
2009-12-26 15:41:54 +00:00
|
|
|
grub_gfxterm_decorator_hook = NULL;
|
|
|
|
|
|
|
|
return grub_gfxterm_set_window (GRUB_VIDEO_RENDER_TARGET_DISPLAY,
|
|
|
|
0, 0, mode_info.width, mode_info.height,
|
2010-01-06 09:51:23 +00:00
|
|
|
double_redraw,
|
2009-12-26 15:41:54 +00:00
|
|
|
font_name, DEFAULT_BORDER_WIDTH);
|
|
|
|
}
|
|
|
|
|
|
|
|
static grub_err_t
|
2010-02-07 02:06:33 +00:00
|
|
|
grub_gfxterm_term_init (void)
|
2009-12-26 15:41:54 +00:00
|
|
|
{
|
|
|
|
char *tmp;
|
|
|
|
grub_err_t err;
|
|
|
|
const char *modevar;
|
|
|
|
|
2006-03-14 19:08:34 +00:00
|
|
|
/* Parse gfxmode environment variable if set. */
|
|
|
|
modevar = grub_env_get ("gfxmode");
|
2009-06-04 18:22:45 +00:00
|
|
|
if (! modevar || *modevar == 0)
|
2009-11-14 15:25:50 +00:00
|
|
|
err = grub_video_set_mode (DEFAULT_VIDEO_MODE,
|
|
|
|
GRUB_VIDEO_MODE_TYPE_PURE_TEXT, 0);
|
2007-06-10 17:31:03 +00:00
|
|
|
else
|
2006-03-14 19:08:34 +00:00
|
|
|
{
|
2010-01-20 08:12:47 +00:00
|
|
|
tmp = grub_xasprintf ("%s;" DEFAULT_VIDEO_MODE, modevar);
|
2009-12-29 09:04:06 +00:00
|
|
|
if (!tmp)
|
|
|
|
return grub_errno;
|
2010-01-20 06:36:17 +00:00
|
|
|
err = grub_video_set_mode (tmp, GRUB_VIDEO_MODE_TYPE_PURE_TEXT, 0);
|
2009-06-04 18:22:45 +00:00
|
|
|
grub_free (tmp);
|
2006-03-14 19:08:34 +00:00
|
|
|
}
|
|
|
|
|
2009-06-04 18:22:45 +00:00
|
|
|
if (err)
|
|
|
|
return err;
|
|
|
|
|
2009-12-26 15:41:54 +00:00
|
|
|
err = grub_gfxterm_fullscreen ();
|
2009-06-04 18:22:45 +00:00
|
|
|
if (err)
|
2009-12-26 15:41:54 +00:00
|
|
|
grub_video_restore ();
|
2006-03-14 19:08:34 +00:00
|
|
|
|
2009-12-26 15:41:54 +00:00
|
|
|
return err;
|
2006-03-14 19:08:34 +00:00
|
|
|
}
|
|
|
|
|
2009-11-14 23:03:03 +00:00
|
|
|
static void
|
|
|
|
destroy_window (void)
|
2006-03-14 19:08:34 +00:00
|
|
|
{
|
2008-01-01 12:02:07 +00:00
|
|
|
if (bitmap)
|
|
|
|
{
|
|
|
|
grub_video_bitmap_destroy (bitmap);
|
|
|
|
bitmap = 0;
|
|
|
|
}
|
|
|
|
|
2009-11-14 23:03:03 +00:00
|
|
|
repaint_callback = 0;
|
2006-03-14 19:08:34 +00:00
|
|
|
grub_virtual_screen_free ();
|
2009-11-14 23:03:03 +00:00
|
|
|
}
|
2006-03-14 19:08:34 +00:00
|
|
|
|
2009-11-14 23:03:03 +00:00
|
|
|
static grub_err_t
|
2010-02-07 02:06:33 +00:00
|
|
|
grub_gfxterm_term_fini (void)
|
2009-11-14 23:03:03 +00:00
|
|
|
{
|
2009-12-26 15:41:54 +00:00
|
|
|
destroy_window ();
|
2006-03-14 19:08:34 +00:00
|
|
|
grub_video_restore ();
|
|
|
|
|
2009-11-14 23:03:03 +00:00
|
|
|
/* Clear error state. */
|
2009-12-26 15:41:54 +00:00
|
|
|
grub_errno = GRUB_ERR_NONE;
|
2006-03-14 19:08:34 +00:00
|
|
|
return GRUB_ERR_NONE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2009-06-10 21:04:23 +00:00
|
|
|
redraw_screen_rect (unsigned int x, unsigned int y,
|
2006-03-14 19:08:34 +00:00
|
|
|
unsigned int width, unsigned int height)
|
|
|
|
{
|
|
|
|
grub_video_color_t color;
|
2009-11-14 23:03:03 +00:00
|
|
|
grub_video_rect_t saved_view;
|
2006-07-31 14:21:36 +00:00
|
|
|
|
2009-11-14 23:03:03 +00:00
|
|
|
grub_video_set_active_render_target (render_target);
|
|
|
|
/* Save viewport and set it to our window. */
|
|
|
|
grub_video_get_viewport ((unsigned *) &saved_view.x,
|
|
|
|
(unsigned *) &saved_view.y,
|
|
|
|
(unsigned *) &saved_view.width,
|
|
|
|
(unsigned *) &saved_view.height);
|
|
|
|
grub_video_set_viewport (window.x, window.y, window.width, window.height);
|
2006-07-31 14:21:36 +00:00
|
|
|
|
2008-01-01 12:02:07 +00:00
|
|
|
if (bitmap)
|
|
|
|
{
|
|
|
|
/* Render bitmap as background. */
|
2009-06-10 21:04:23 +00:00
|
|
|
grub_video_blit_bitmap (bitmap, GRUB_VIDEO_BLIT_REPLACE, x, y,
|
2009-03-21 Bean <bean123ch@gmail.com>
* 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.
2009-03-21 08:39:59 +00:00
|
|
|
x, y,
|
2008-01-01 12:02:07 +00:00
|
|
|
width, height);
|
2009-06-10 21:04:23 +00:00
|
|
|
|
|
|
|
/* If bitmap is smaller than requested blit area, use background
|
2008-01-01 12:02:07 +00:00
|
|
|
color. */
|
2009-10-24 19:01:27 +00:00
|
|
|
color = virtual_screen.bg_color_display;
|
2008-01-01 12:02:07 +00:00
|
|
|
|
|
|
|
/* Fill right side of the bitmap if needed. */
|
|
|
|
if ((x + width >= bitmap_width) && (y < bitmap_height))
|
|
|
|
{
|
|
|
|
int w = (x + width) - bitmap_width;
|
|
|
|
int h = height;
|
|
|
|
unsigned int tx = x;
|
|
|
|
|
|
|
|
if (y + height >= bitmap_height)
|
|
|
|
{
|
|
|
|
h = bitmap_height - y;
|
|
|
|
}
|
2009-06-10 21:04:23 +00:00
|
|
|
|
2008-01-01 12:02:07 +00:00
|
|
|
if (bitmap_width > tx)
|
|
|
|
{
|
|
|
|
tx = bitmap_width;
|
|
|
|
}
|
2009-06-10 21:04:23 +00:00
|
|
|
|
2008-01-01 12:02:07 +00:00
|
|
|
/* Render background layer. */
|
2009-03-21 Bean <bean123ch@gmail.com>
* 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.
2009-03-21 08:39:59 +00:00
|
|
|
grub_video_fill_rect (color, tx, y, w, h);
|
2008-01-01 12:02:07 +00:00
|
|
|
}
|
2009-06-10 21:04:23 +00:00
|
|
|
|
2008-01-01 12:02:07 +00:00
|
|
|
/* Fill bottom side of the bitmap if needed. */
|
|
|
|
if (y + height >= bitmap_height)
|
|
|
|
{
|
|
|
|
int h = (y + height) - bitmap_height;
|
|
|
|
unsigned int ty = y;
|
2009-06-10 21:04:23 +00:00
|
|
|
|
2008-01-01 12:02:07 +00:00
|
|
|
if (bitmap_height > ty)
|
|
|
|
{
|
|
|
|
ty = bitmap_height;
|
|
|
|
}
|
2009-06-10 21:04:23 +00:00
|
|
|
|
2008-01-01 12:02:07 +00:00
|
|
|
/* Render background layer. */
|
2009-03-21 Bean <bean123ch@gmail.com>
* 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.
2009-03-21 08:39:59 +00:00
|
|
|
grub_video_fill_rect (color, x, ty, width, h);
|
2008-01-01 12:02:07 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Render text layer as blended. */
|
|
|
|
grub_video_blit_render_target (text_layer, GRUB_VIDEO_BLIT_BLEND, x, y,
|
|
|
|
x - virtual_screen.offset_x,
|
|
|
|
y - virtual_screen.offset_y,
|
|
|
|
width, height);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* Render background layer. */
|
2009-10-24 19:01:27 +00:00
|
|
|
color = virtual_screen.bg_color_display;
|
2008-01-01 12:02:07 +00:00
|
|
|
grub_video_fill_rect (color, x, y, width, height);
|
|
|
|
|
|
|
|
/* Render text layer as replaced (to get texts background color). */
|
|
|
|
grub_video_blit_render_target (text_layer, GRUB_VIDEO_BLIT_REPLACE, x, y,
|
|
|
|
x - virtual_screen.offset_x,
|
|
|
|
y - virtual_screen.offset_y,
|
2009-03-21 Bean <bean123ch@gmail.com>
* 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.
2009-03-21 08:39:59 +00:00
|
|
|
width, height);
|
2008-01-01 12:02:07 +00:00
|
|
|
}
|
2009-11-14 23:03:03 +00:00
|
|
|
|
|
|
|
/* Restore saved viewport. */
|
|
|
|
grub_video_set_viewport (saved_view.x, saved_view.y,
|
|
|
|
saved_view.width, saved_view.height);
|
|
|
|
grub_video_set_active_render_target (render_target);
|
|
|
|
|
|
|
|
if (repaint_callback)
|
|
|
|
repaint_callback (x, y, width, height);
|
2006-03-14 19:08:34 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
dirty_region_reset (void)
|
|
|
|
{
|
|
|
|
dirty_region.top_left_x = -1;
|
|
|
|
dirty_region.top_left_y = -1;
|
|
|
|
dirty_region.bottom_right_x = -1;
|
|
|
|
dirty_region.bottom_right_y = -1;
|
2009-12-26 15:41:54 +00:00
|
|
|
repaint_was_schedulded = 0;
|
2006-03-14 19:08:34 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
dirty_region_is_empty (void)
|
|
|
|
{
|
|
|
|
if ((dirty_region.top_left_x == -1)
|
|
|
|
|| (dirty_region.top_left_y == -1)
|
|
|
|
|| (dirty_region.bottom_right_x == -1)
|
|
|
|
|| (dirty_region.bottom_right_y == -1))
|
|
|
|
return 1;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
dirty_region_add (int x, int y, unsigned int width, unsigned int height)
|
|
|
|
{
|
|
|
|
if ((width == 0) || (height == 0))
|
|
|
|
return;
|
2006-07-31 14:21:36 +00:00
|
|
|
|
2009-12-26 15:41:54 +00:00
|
|
|
if (repaint_schedulded)
|
|
|
|
{
|
|
|
|
x = virtual_screen.offset_x;
|
|
|
|
y = virtual_screen.offset_y;
|
|
|
|
width = virtual_screen.width;
|
|
|
|
height = virtual_screen.height;
|
|
|
|
repaint_schedulded = 0;
|
|
|
|
repaint_was_schedulded = 1;
|
|
|
|
}
|
|
|
|
|
2006-03-14 19:08:34 +00:00
|
|
|
if (dirty_region_is_empty ())
|
|
|
|
{
|
|
|
|
dirty_region.top_left_x = x;
|
|
|
|
dirty_region.top_left_y = y;
|
|
|
|
dirty_region.bottom_right_x = x + width - 1;
|
|
|
|
dirty_region.bottom_right_y = y + height - 1;
|
2009-06-10 21:04:23 +00:00
|
|
|
}
|
2006-03-14 19:08:34 +00:00
|
|
|
else
|
|
|
|
{
|
|
|
|
if (x < dirty_region.top_left_x)
|
|
|
|
dirty_region.top_left_x = x;
|
|
|
|
if (y < dirty_region.top_left_y)
|
|
|
|
dirty_region.top_left_y = y;
|
|
|
|
if ((x + (int)width - 1) > dirty_region.bottom_right_x)
|
|
|
|
dirty_region.bottom_right_x = x + width - 1;
|
|
|
|
if ((y + (int)height - 1) > dirty_region.bottom_right_y)
|
|
|
|
dirty_region.bottom_right_y = y + height - 1;
|
|
|
|
}
|
2009-06-10 21:04:23 +00:00
|
|
|
}
|
2006-03-14 19:08:34 +00:00
|
|
|
|
|
|
|
static void
|
|
|
|
dirty_region_add_virtualscreen (void)
|
|
|
|
{
|
|
|
|
/* Mark virtual screen as dirty. */
|
|
|
|
dirty_region_add (virtual_screen.offset_x, virtual_screen.offset_y,
|
|
|
|
virtual_screen.width, virtual_screen.height);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
dirty_region_redraw (void)
|
|
|
|
{
|
|
|
|
int x;
|
|
|
|
int y;
|
|
|
|
int width;
|
|
|
|
int height;
|
2006-07-31 14:21:36 +00:00
|
|
|
|
2006-03-14 19:08:34 +00:00
|
|
|
if (dirty_region_is_empty ())
|
|
|
|
return;
|
2006-07-31 14:21:36 +00:00
|
|
|
|
2006-03-14 19:08:34 +00:00
|
|
|
x = dirty_region.top_left_x;
|
|
|
|
y = dirty_region.top_left_y;
|
2006-07-31 14:21:36 +00:00
|
|
|
|
2006-03-14 19:08:34 +00:00
|
|
|
width = dirty_region.bottom_right_x - x + 1;
|
|
|
|
height = dirty_region.bottom_right_y - y + 1;
|
2006-07-31 14:21:36 +00:00
|
|
|
|
2009-12-26 15:41:54 +00:00
|
|
|
if (repaint_was_schedulded && grub_gfxterm_decorator_hook)
|
|
|
|
grub_gfxterm_decorator_hook ();
|
2006-07-31 14:21:36 +00:00
|
|
|
|
2006-03-14 19:08:34 +00:00
|
|
|
redraw_screen_rect (x, y, width, height);
|
|
|
|
}
|
|
|
|
|
2009-11-30 11:51:20 +00:00
|
|
|
static inline void
|
|
|
|
paint_char (unsigned cx, unsigned cy)
|
2006-03-14 19:08:34 +00:00
|
|
|
{
|
|
|
|
struct grub_colored_char *p;
|
2009-01-02 15:26:06 +00:00
|
|
|
struct grub_font_glyph *glyph;
|
2006-03-14 19:08:34 +00:00
|
|
|
grub_video_color_t color;
|
2006-07-31 14:21:36 +00:00
|
|
|
grub_video_color_t bgcolor;
|
2006-03-14 19:08:34 +00:00
|
|
|
unsigned int x;
|
|
|
|
unsigned int y;
|
2009-01-02 15:26:06 +00:00
|
|
|
int ascent;
|
2009-01-19 17:09:53 +00:00
|
|
|
unsigned int height;
|
|
|
|
unsigned int width;
|
2006-03-14 19:08:34 +00:00
|
|
|
|
2009-11-30 11:51:20 +00:00
|
|
|
if (cy + virtual_screen.total_scroll >= virtual_screen.rows)
|
|
|
|
return;
|
|
|
|
|
2006-03-14 19:08:34 +00:00
|
|
|
/* Find out active character. */
|
|
|
|
p = (virtual_screen.text_buffer
|
2009-11-30 11:51:20 +00:00
|
|
|
+ cx + (cy * virtual_screen.columns));
|
2006-03-14 19:08:34 +00:00
|
|
|
|
|
|
|
p -= p->index;
|
|
|
|
|
|
|
|
/* Get glyph for character. */
|
2010-03-15 20:14:11 +00:00
|
|
|
glyph = grub_font_construct_glyph (virtual_screen.font, p->code);
|
|
|
|
if (!glyph)
|
|
|
|
{
|
|
|
|
grub_errno = GRUB_ERR_NONE;
|
|
|
|
return;
|
|
|
|
}
|
2009-01-02 15:26:06 +00:00
|
|
|
ascent = grub_font_get_ascent (virtual_screen.font);
|
2009-06-10 21:04:23 +00:00
|
|
|
|
2009-01-19 17:09:53 +00:00
|
|
|
width = virtual_screen.normal_char_width * calculate_character_width(glyph);
|
|
|
|
height = virtual_screen.normal_char_height;
|
2009-06-10 21:04:23 +00:00
|
|
|
|
2006-03-14 19:08:34 +00:00
|
|
|
color = p->fg_color;
|
|
|
|
bgcolor = p->bg_color;
|
|
|
|
|
2009-11-30 11:51:20 +00:00
|
|
|
x = cx * virtual_screen.normal_char_width;
|
|
|
|
y = (cy + virtual_screen.total_scroll) * virtual_screen.normal_char_height;
|
2006-03-14 19:08:34 +00:00
|
|
|
|
|
|
|
/* Render glyph to text layer. */
|
|
|
|
grub_video_set_active_render_target (text_layer);
|
2009-01-19 17:09:53 +00:00
|
|
|
grub_video_fill_rect (bgcolor, x, y, width, height);
|
2009-01-02 15:26:06 +00:00
|
|
|
grub_font_draw_glyph (glyph, color, x, y + ascent);
|
2009-11-14 23:03:03 +00:00
|
|
|
grub_video_set_active_render_target (render_target);
|
2006-03-14 19:08:34 +00:00
|
|
|
|
|
|
|
/* Mark character to be drawn. */
|
|
|
|
dirty_region_add (virtual_screen.offset_x + x, virtual_screen.offset_y + y,
|
2009-01-19 17:09:53 +00:00
|
|
|
width, height);
|
2010-03-15 20:14:11 +00:00
|
|
|
grub_free (glyph);
|
2006-03-14 19:08:34 +00:00
|
|
|
}
|
|
|
|
|
2009-11-30 11:51:20 +00:00
|
|
|
static inline void
|
|
|
|
write_char (void)
|
|
|
|
{
|
|
|
|
paint_char (virtual_screen.cursor_x, virtual_screen.cursor_y);
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void
|
2009-01-02 15:26:06 +00:00
|
|
|
draw_cursor (int show)
|
2006-03-14 19:08:34 +00:00
|
|
|
{
|
2009-11-30 11:51:20 +00:00
|
|
|
unsigned int x;
|
|
|
|
unsigned int y;
|
|
|
|
unsigned int width;
|
|
|
|
unsigned int height;
|
|
|
|
grub_video_color_t color;
|
|
|
|
|
2009-03-12 18:30:44 +00:00
|
|
|
write_char ();
|
2006-03-14 19:08:34 +00:00
|
|
|
|
2009-11-30 11:51:20 +00:00
|
|
|
if (!show)
|
|
|
|
return;
|
2006-03-14 19:08:34 +00:00
|
|
|
|
2009-11-30 11:51:20 +00:00
|
|
|
if (virtual_screen.cursor_y + virtual_screen.total_scroll
|
|
|
|
>= virtual_screen.rows)
|
|
|
|
return;
|
|
|
|
|
|
|
|
/* Determine cursor properties and position on text layer. */
|
|
|
|
x = virtual_screen.cursor_x * virtual_screen.normal_char_width;
|
|
|
|
width = virtual_screen.normal_char_width;
|
|
|
|
color = virtual_screen.fg_color;
|
|
|
|
y = ((virtual_screen.cursor_y + virtual_screen.total_scroll)
|
|
|
|
* virtual_screen.normal_char_height
|
|
|
|
+ grub_font_get_ascent (virtual_screen.font));
|
|
|
|
height = 2;
|
|
|
|
|
|
|
|
/* Render cursor to text layer. */
|
|
|
|
grub_video_set_active_render_target (text_layer);
|
|
|
|
grub_video_fill_rect (color, x, y, width, height);
|
|
|
|
grub_video_set_active_render_target (render_target);
|
|
|
|
|
|
|
|
/* Mark cursor to be redrawn. */
|
|
|
|
dirty_region_add (virtual_screen.offset_x + x,
|
|
|
|
virtual_screen.offset_y + y,
|
|
|
|
width, height);
|
2006-03-14 19:08:34 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2009-11-30 11:51:20 +00:00
|
|
|
real_scroll (void)
|
2006-03-14 19:08:34 +00:00
|
|
|
{
|
2009-11-30 11:51:20 +00:00
|
|
|
unsigned int i, j, was_scroll;
|
2006-03-14 19:08:34 +00:00
|
|
|
grub_video_color_t color;
|
|
|
|
|
2009-11-30 11:51:20 +00:00
|
|
|
if (!virtual_screen.total_scroll)
|
|
|
|
return;
|
2006-07-31 14:21:36 +00:00
|
|
|
|
2008-01-01 12:02:07 +00:00
|
|
|
/* If we have bitmap, re-draw screen, otherwise scroll physical screen too. */
|
|
|
|
if (bitmap)
|
|
|
|
{
|
2009-11-14 16:59:11 +00:00
|
|
|
/* Scroll physical screen. */
|
|
|
|
grub_video_set_active_render_target (text_layer);
|
|
|
|
color = virtual_screen.bg_color;
|
2009-11-30 11:51:20 +00:00
|
|
|
grub_video_scroll (color, 0, -virtual_screen.normal_char_height
|
|
|
|
* virtual_screen.total_scroll);
|
2009-11-14 16:59:11 +00:00
|
|
|
|
2008-01-01 12:02:07 +00:00
|
|
|
/* Mark virtual screen to be redrawn. */
|
|
|
|
dirty_region_add_virtualscreen ();
|
|
|
|
}
|
|
|
|
else
|
2009-06-10 21:04:23 +00:00
|
|
|
{
|
2009-11-14 23:03:03 +00:00
|
|
|
grub_video_rect_t saved_view;
|
|
|
|
|
2008-01-01 12:02:07 +00:00
|
|
|
/* Remove cursor. */
|
2009-01-02 15:26:06 +00:00
|
|
|
draw_cursor (0);
|
2008-01-01 12:02:07 +00:00
|
|
|
|
2009-11-14 23:03:03 +00:00
|
|
|
grub_video_set_active_render_target (render_target);
|
|
|
|
/* Save viewport and set it to our window. */
|
|
|
|
grub_video_get_viewport ((unsigned *) &saved_view.x,
|
|
|
|
(unsigned *) &saved_view.y,
|
|
|
|
(unsigned *) &saved_view.width,
|
|
|
|
(unsigned *) &saved_view.height);
|
|
|
|
grub_video_set_viewport (window.x, window.y, window.width, window.height);
|
|
|
|
|
|
|
|
i = window.double_repaint ? 2 : 1;
|
2009-11-14 16:59:11 +00:00
|
|
|
|
|
|
|
color = virtual_screen.bg_color;
|
|
|
|
|
|
|
|
while (i--)
|
|
|
|
{
|
|
|
|
/* Clear new border area. */
|
|
|
|
grub_video_fill_rect (color,
|
|
|
|
virtual_screen.offset_x,
|
|
|
|
virtual_screen.offset_y,
|
|
|
|
virtual_screen.width,
|
2009-11-30 11:51:20 +00:00
|
|
|
virtual_screen.normal_char_height
|
|
|
|
* virtual_screen.total_scroll);
|
2009-11-14 16:59:11 +00:00
|
|
|
|
2009-11-14 23:03:03 +00:00
|
|
|
grub_video_set_active_render_target (render_target);
|
2009-11-14 16:59:11 +00:00
|
|
|
dirty_region_redraw ();
|
|
|
|
|
|
|
|
/* Scroll physical screen. */
|
2009-11-30 11:51:20 +00:00
|
|
|
grub_video_scroll (color, 0, -virtual_screen.normal_char_height
|
|
|
|
* virtual_screen.total_scroll);
|
2009-11-14 16:59:11 +00:00
|
|
|
|
|
|
|
if (i)
|
|
|
|
grub_video_swap_buffers ();
|
|
|
|
}
|
|
|
|
dirty_region_reset ();
|
2009-01-02 15:26:06 +00:00
|
|
|
|
2008-01-01 12:02:07 +00:00
|
|
|
/* Scroll physical screen. */
|
2009-11-14 16:59:11 +00:00
|
|
|
grub_video_set_active_render_target (text_layer);
|
|
|
|
color = virtual_screen.bg_color;
|
2009-11-30 11:51:20 +00:00
|
|
|
grub_video_scroll (color, 0, -virtual_screen.normal_char_height
|
|
|
|
* virtual_screen.total_scroll);
|
2006-07-31 14:21:36 +00:00
|
|
|
|
2009-11-14 23:03:03 +00:00
|
|
|
/* Restore saved viewport. */
|
|
|
|
grub_video_set_viewport (saved_view.x, saved_view.y,
|
|
|
|
saved_view.width, saved_view.height);
|
|
|
|
grub_video_set_active_render_target (render_target);
|
2009-11-14 16:59:11 +00:00
|
|
|
|
2008-01-01 12:02:07 +00:00
|
|
|
}
|
2009-06-10 21:04:23 +00:00
|
|
|
|
2009-11-30 11:51:20 +00:00
|
|
|
was_scroll = virtual_screen.total_scroll;
|
|
|
|
virtual_screen.total_scroll = 0;
|
|
|
|
|
2009-12-02 20:03:41 +00:00
|
|
|
if (was_scroll > virtual_screen.rows)
|
|
|
|
was_scroll = virtual_screen.rows;
|
|
|
|
|
2009-11-30 11:51:20 +00:00
|
|
|
/* Draw shadow part. */
|
|
|
|
for (i = virtual_screen.rows - was_scroll;
|
|
|
|
i < virtual_screen.rows; i++)
|
|
|
|
for (j = 0; j < virtual_screen.columns; j++)
|
|
|
|
paint_char (j, i);
|
|
|
|
|
2009-12-02 20:03:41 +00:00
|
|
|
/* Draw cursor if visible. */
|
|
|
|
if (virtual_screen.cursor_state)
|
|
|
|
draw_cursor (1);
|
|
|
|
|
2009-11-14 23:03:03 +00:00
|
|
|
if (repaint_callback)
|
|
|
|
repaint_callback (window.x, window.y, window.width, window.height);
|
2006-03-14 19:08:34 +00:00
|
|
|
}
|
|
|
|
|
2009-11-30 11:51:20 +00:00
|
|
|
static void
|
|
|
|
scroll_up (void)
|
|
|
|
{
|
|
|
|
unsigned int i;
|
|
|
|
|
2010-03-15 20:14:11 +00:00
|
|
|
/* Clear first line in text buffer. */
|
|
|
|
for (i = 0;
|
|
|
|
i < virtual_screen.columns;
|
|
|
|
i++)
|
|
|
|
{
|
|
|
|
virtual_screen.text_buffer[i].code = 0;
|
|
|
|
clear_char (&(virtual_screen.text_buffer[i]));
|
|
|
|
}
|
|
|
|
|
2006-03-14 19:08:34 +00:00
|
|
|
/* Scroll text buffer with one line to up. */
|
|
|
|
grub_memmove (virtual_screen.text_buffer,
|
2006-07-31 14:21:36 +00:00
|
|
|
virtual_screen.text_buffer + virtual_screen.columns,
|
2006-03-14 19:08:34 +00:00
|
|
|
sizeof (*virtual_screen.text_buffer)
|
|
|
|
* virtual_screen.columns
|
|
|
|
* (virtual_screen.rows - 1));
|
|
|
|
|
|
|
|
/* Clear last line in text buffer. */
|
|
|
|
for (i = virtual_screen.columns * (virtual_screen.rows - 1);
|
|
|
|
i < virtual_screen.columns * virtual_screen.rows;
|
|
|
|
i++)
|
2010-03-15 20:14:11 +00:00
|
|
|
{
|
|
|
|
virtual_screen.text_buffer[i].code = 0;
|
|
|
|
clear_char (&(virtual_screen.text_buffer[i]));
|
|
|
|
}
|
2006-07-31 14:21:36 +00:00
|
|
|
|
2009-11-30 11:51:20 +00:00
|
|
|
virtual_screen.total_scroll++;
|
2006-03-14 19:08:34 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2010-03-15 20:14:11 +00:00
|
|
|
grub_gfxterm_putchar (const struct grub_unicode_glyph *c)
|
2006-03-14 19:08:34 +00:00
|
|
|
{
|
2010-03-15 20:14:11 +00:00
|
|
|
if (c->base == '\a')
|
2006-03-14 19:08:34 +00:00
|
|
|
/* FIXME */
|
|
|
|
return;
|
|
|
|
|
2009-03-12 18:30:44 +00:00
|
|
|
/* Erase current cursor, if any. */
|
|
|
|
if (virtual_screen.cursor_state)
|
|
|
|
draw_cursor (0);
|
|
|
|
|
2010-03-15 20:14:11 +00:00
|
|
|
if (c->base == '\b' || c->base == '\n' || c->base == '\r')
|
2006-03-14 19:08:34 +00:00
|
|
|
{
|
2010-03-15 20:14:11 +00:00
|
|
|
switch (c->base)
|
2006-07-31 14:21:36 +00:00
|
|
|
{
|
|
|
|
case '\b':
|
|
|
|
if (virtual_screen.cursor_x > 0)
|
|
|
|
virtual_screen.cursor_x--;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case '\n':
|
|
|
|
if (virtual_screen.cursor_y >= virtual_screen.rows - 1)
|
|
|
|
scroll_up ();
|
|
|
|
else
|
|
|
|
virtual_screen.cursor_y++;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case '\r':
|
|
|
|
virtual_screen.cursor_x = 0;
|
|
|
|
break;
|
|
|
|
}
|
2006-03-14 19:08:34 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
struct grub_colored_char *p;
|
2009-01-02 15:26:06 +00:00
|
|
|
unsigned char char_width;
|
|
|
|
|
|
|
|
/* Calculate actual character width for glyph. This is number of
|
|
|
|
times of normal_font_width. */
|
2010-03-15 20:14:11 +00:00
|
|
|
char_width = grub_gfxterm_getcharwidth (c);
|
2006-03-14 19:08:34 +00:00
|
|
|
|
|
|
|
/* If we are about to exceed line length, wrap to next line. */
|
2009-01-02 15:26:06 +00:00
|
|
|
if (virtual_screen.cursor_x + char_width > virtual_screen.columns)
|
2010-03-15 20:14:11 +00:00
|
|
|
{
|
|
|
|
if (virtual_screen.cursor_y >= virtual_screen.rows - 1)
|
|
|
|
scroll_up ();
|
|
|
|
else
|
|
|
|
virtual_screen.cursor_y++;
|
|
|
|
}
|
2006-03-14 19:08:34 +00:00
|
|
|
|
|
|
|
/* Find position on virtual screen, and fill information. */
|
|
|
|
p = (virtual_screen.text_buffer +
|
2006-07-31 14:21:36 +00:00
|
|
|
virtual_screen.cursor_x +
|
|
|
|
virtual_screen.cursor_y * virtual_screen.columns);
|
2010-03-15 20:14:11 +00:00
|
|
|
grub_free (p->code);
|
|
|
|
p->code = grub_unicode_glyph_dup (c);
|
|
|
|
if (!p->code)
|
|
|
|
grub_errno = GRUB_ERR_NONE;
|
2006-03-14 19:08:34 +00:00
|
|
|
p->fg_color = virtual_screen.fg_color;
|
|
|
|
p->bg_color = virtual_screen.bg_color;
|
2009-01-02 15:26:06 +00:00
|
|
|
p->width = char_width - 1;
|
2006-03-14 19:08:34 +00:00
|
|
|
p->index = 0;
|
|
|
|
|
|
|
|
/* If we have large glyph, add fixup info. */
|
2009-01-02 15:26:06 +00:00
|
|
|
if (char_width > 1)
|
2006-07-31 14:21:36 +00:00
|
|
|
{
|
|
|
|
unsigned i;
|
|
|
|
|
2009-01-02 15:26:06 +00:00
|
|
|
for (i = 1; i < char_width; i++)
|
2006-07-31 14:21:36 +00:00
|
|
|
{
|
2010-03-15 20:14:11 +00:00
|
|
|
grub_free (p[i].code);
|
|
|
|
p[i].code = grub_unicode_glyph_from_code (' ');
|
|
|
|
if (!p[i].code)
|
|
|
|
grub_errno = GRUB_ERR_NONE;
|
2009-01-02 15:26:06 +00:00
|
|
|
p[i].width = char_width - 1;
|
2006-07-31 14:21:36 +00:00
|
|
|
p[i].index = i;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-03-14 19:08:34 +00:00
|
|
|
/* Draw glyph. */
|
|
|
|
write_char ();
|
2006-07-31 14:21:36 +00:00
|
|
|
|
2006-03-14 19:08:34 +00:00
|
|
|
/* Make sure we scroll screen when needed and wrap line correctly. */
|
2009-01-02 15:26:06 +00:00
|
|
|
virtual_screen.cursor_x += char_width;
|
2006-03-14 19:08:34 +00:00
|
|
|
if (virtual_screen.cursor_x >= virtual_screen.columns)
|
2006-07-31 14:21:36 +00:00
|
|
|
{
|
|
|
|
virtual_screen.cursor_x = 0;
|
|
|
|
|
|
|
|
if (virtual_screen.cursor_y >= virtual_screen.rows - 1)
|
|
|
|
scroll_up ();
|
|
|
|
else
|
|
|
|
virtual_screen.cursor_y++;
|
|
|
|
}
|
2006-03-14 19:08:34 +00:00
|
|
|
}
|
2009-03-12 18:30:44 +00:00
|
|
|
|
|
|
|
/* Redraw cursor if it should be visible. */
|
|
|
|
/* Note: This will redraw the character as well, which means that the
|
|
|
|
above call to write_char is redundant when the cursor is showing. */
|
|
|
|
if (virtual_screen.cursor_state)
|
|
|
|
draw_cursor (1);
|
2006-03-14 19:08:34 +00:00
|
|
|
}
|
|
|
|
|
2009-01-02 15:26:06 +00:00
|
|
|
/* Use ASCII characters to determine normal character width. */
|
|
|
|
static unsigned int
|
|
|
|
calculate_normal_character_width (grub_font_t font)
|
|
|
|
{
|
|
|
|
struct grub_font_glyph *glyph;
|
|
|
|
unsigned int width = 0;
|
|
|
|
unsigned int i;
|
|
|
|
|
|
|
|
/* Get properties of every printable ASCII character. */
|
|
|
|
for (i = 32; i < 127; i++)
|
|
|
|
{
|
|
|
|
glyph = grub_font_get_glyph (font, i);
|
|
|
|
|
|
|
|
/* Skip unknown characters. Should never happen on normal conditions. */
|
|
|
|
if (! glyph)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
if (glyph->device_width > width)
|
|
|
|
width = glyph->device_width;
|
|
|
|
}
|
|
|
|
|
|
|
|
return width;
|
|
|
|
}
|
|
|
|
|
|
|
|
static unsigned char
|
|
|
|
calculate_character_width (struct grub_font_glyph *glyph)
|
|
|
|
{
|
|
|
|
if (! glyph || glyph->device_width == 0)
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
return (glyph->device_width
|
|
|
|
+ (virtual_screen.normal_char_width - 1))
|
|
|
|
/ virtual_screen.normal_char_width;
|
|
|
|
}
|
|
|
|
|
2006-03-14 19:08:34 +00:00
|
|
|
static grub_ssize_t
|
2010-03-15 20:14:11 +00:00
|
|
|
grub_gfxterm_getcharwidth (const struct grub_unicode_glyph *c)
|
2006-03-14 19:08:34 +00:00
|
|
|
{
|
2010-03-15 20:14:11 +00:00
|
|
|
int dev_width;
|
|
|
|
dev_width = grub_font_get_constructed_device_width (virtual_screen.font, c);
|
2006-07-31 14:21:36 +00:00
|
|
|
|
2010-03-15 20:14:11 +00:00
|
|
|
if (dev_width == 0)
|
|
|
|
return 1;
|
2006-03-14 19:08:34 +00:00
|
|
|
|
2010-03-15 20:14:11 +00:00
|
|
|
return (dev_width + (virtual_screen.normal_char_width - 1))
|
|
|
|
/ virtual_screen.normal_char_width;
|
2006-03-14 19:08:34 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static grub_uint16_t
|
|
|
|
grub_virtual_screen_getwh (void)
|
|
|
|
{
|
|
|
|
return (virtual_screen.columns << 8) | virtual_screen.rows;
|
|
|
|
}
|
|
|
|
|
|
|
|
static grub_uint16_t
|
|
|
|
grub_virtual_screen_getxy (void)
|
|
|
|
{
|
|
|
|
return ((virtual_screen.cursor_x << 8) | virtual_screen.cursor_y);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
grub_gfxterm_gotoxy (grub_uint8_t x, grub_uint8_t y)
|
|
|
|
{
|
|
|
|
if (x >= virtual_screen.columns)
|
|
|
|
x = virtual_screen.columns - 1;
|
2006-07-31 14:21:36 +00:00
|
|
|
|
2006-03-14 19:08:34 +00:00
|
|
|
if (y >= virtual_screen.rows)
|
|
|
|
y = virtual_screen.rows - 1;
|
|
|
|
|
2009-01-02 15:26:06 +00:00
|
|
|
/* Erase current cursor, if any. */
|
2006-03-14 19:08:34 +00:00
|
|
|
if (virtual_screen.cursor_state)
|
2009-01-02 15:26:06 +00:00
|
|
|
draw_cursor (0);
|
2006-03-14 19:08:34 +00:00
|
|
|
|
|
|
|
virtual_screen.cursor_x = x;
|
|
|
|
virtual_screen.cursor_y = y;
|
|
|
|
|
2009-01-02 15:26:06 +00:00
|
|
|
/* Draw cursor if visible. */
|
2006-03-14 19:08:34 +00:00
|
|
|
if (virtual_screen.cursor_state)
|
2009-01-02 15:26:06 +00:00
|
|
|
draw_cursor (1);
|
2006-03-14 19:08:34 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
grub_virtual_screen_cls (void)
|
|
|
|
{
|
|
|
|
grub_uint32_t i;
|
|
|
|
|
|
|
|
for (i = 0; i < virtual_screen.columns * virtual_screen.rows; i++)
|
2009-07-29 22:12:00 +00:00
|
|
|
clear_char (&(virtual_screen.text_buffer[i]));
|
2006-03-14 19:08:34 +00:00
|
|
|
|
|
|
|
virtual_screen.cursor_x = virtual_screen.cursor_y = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
grub_gfxterm_cls (void)
|
|
|
|
{
|
|
|
|
grub_video_color_t color;
|
|
|
|
|
|
|
|
/* Clear virtual screen. */
|
|
|
|
grub_virtual_screen_cls ();
|
2006-07-31 14:21:36 +00:00
|
|
|
|
2006-03-14 19:08:34 +00:00
|
|
|
/* Clear text layer. */
|
|
|
|
grub_video_set_active_render_target (text_layer);
|
2008-01-01 12:02:07 +00:00
|
|
|
color = virtual_screen.bg_color;
|
2009-11-14 23:03:03 +00:00
|
|
|
grub_video_fill_rect (color, 0, 0,
|
|
|
|
virtual_screen.width, virtual_screen.height);
|
|
|
|
grub_video_set_active_render_target (render_target);
|
2006-07-31 14:21:36 +00:00
|
|
|
|
2006-03-14 19:08:34 +00:00
|
|
|
/* Mark virtual screen to be redrawn. */
|
|
|
|
dirty_region_add_virtualscreen ();
|
2009-11-14 16:00:39 +00:00
|
|
|
|
|
|
|
grub_gfxterm_refresh ();
|
2006-03-14 19:08:34 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
grub_virtual_screen_setcolorstate (grub_term_color_state state)
|
|
|
|
{
|
|
|
|
switch (state)
|
|
|
|
{
|
|
|
|
case GRUB_TERM_COLOR_STANDARD:
|
2008-01-01 12:02:07 +00:00
|
|
|
virtual_screen.term_color = virtual_screen.standard_color_setting;
|
|
|
|
break;
|
2009-06-10 21:04:23 +00:00
|
|
|
|
2006-03-14 19:08:34 +00:00
|
|
|
case GRUB_TERM_COLOR_NORMAL:
|
2008-01-01 12:02:07 +00:00
|
|
|
virtual_screen.term_color = virtual_screen.normal_color_setting;
|
2006-03-14 19:08:34 +00:00
|
|
|
break;
|
2009-06-10 21:04:23 +00:00
|
|
|
|
2006-03-14 19:08:34 +00:00
|
|
|
case GRUB_TERM_COLOR_HIGHLIGHT:
|
2008-01-01 12:02:07 +00:00
|
|
|
virtual_screen.term_color = virtual_screen.highlight_color_setting;
|
2006-03-14 19:08:34 +00:00
|
|
|
break;
|
2009-06-10 21:04:23 +00:00
|
|
|
|
2006-03-14 19:08:34 +00:00
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
2008-01-01 12:02:07 +00:00
|
|
|
|
|
|
|
/* Change color to virtual terminal. */
|
|
|
|
set_term_color (virtual_screen.term_color);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
grub_virtual_screen_setcolor (grub_uint8_t normal_color,
|
|
|
|
grub_uint8_t highlight_color)
|
|
|
|
{
|
|
|
|
virtual_screen.normal_color_setting = normal_color;
|
|
|
|
virtual_screen.highlight_color_setting = highlight_color;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
grub_virtual_screen_getcolor (grub_uint8_t *normal_color,
|
|
|
|
grub_uint8_t *highlight_color)
|
|
|
|
{
|
|
|
|
*normal_color = virtual_screen.normal_color_setting;
|
|
|
|
*highlight_color = virtual_screen.highlight_color_setting;
|
2006-03-14 19:08:34 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
grub_gfxterm_setcursor (int on)
|
|
|
|
{
|
|
|
|
if (virtual_screen.cursor_state != on)
|
|
|
|
{
|
|
|
|
if (virtual_screen.cursor_state)
|
2009-01-02 15:26:06 +00:00
|
|
|
draw_cursor (0);
|
2006-03-14 19:08:34 +00:00
|
|
|
else
|
2009-01-02 15:26:06 +00:00
|
|
|
draw_cursor (1);
|
2006-03-14 19:08:34 +00:00
|
|
|
|
|
|
|
virtual_screen.cursor_state = on;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
grub_gfxterm_refresh (void)
|
|
|
|
{
|
2009-11-30 11:51:20 +00:00
|
|
|
real_scroll ();
|
|
|
|
|
2006-03-14 19:08:34 +00:00
|
|
|
/* Redraw only changed regions. */
|
|
|
|
dirty_region_redraw ();
|
2009-11-14 16:00:39 +00:00
|
|
|
|
|
|
|
grub_video_swap_buffers ();
|
2009-11-14 16:59:11 +00:00
|
|
|
|
2009-11-14 23:03:03 +00:00
|
|
|
if (window.double_repaint)
|
2009-11-14 16:59:11 +00:00
|
|
|
dirty_region_redraw ();
|
|
|
|
dirty_region_reset ();
|
2006-03-14 19:08:34 +00:00
|
|
|
}
|
|
|
|
|
2009-11-14 23:03:03 +00:00
|
|
|
void
|
|
|
|
grub_gfxterm_set_repaint_callback (grub_gfxterm_repaint_callback_t func)
|
|
|
|
{
|
|
|
|
repaint_callback = func;
|
2006-03-14 19:08:34 +00:00
|
|
|
}
|
|
|
|
|
2009-11-20 09:46:30 +00:00
|
|
|
/* Option array indices. */
|
|
|
|
#define BACKGROUND_CMD_ARGINDEX_MODE 0
|
|
|
|
|
|
|
|
static const struct grub_arg_option background_image_cmd_options[] =
|
|
|
|
{
|
|
|
|
{"mode", 'm', 0, "Background image mode.", "stretch|normal",
|
|
|
|
ARG_TYPE_STRING},
|
|
|
|
{0, 0, 0, 0, 0, 0}
|
|
|
|
};
|
|
|
|
|
2008-01-01 12:02:07 +00:00
|
|
|
static grub_err_t
|
2009-11-20 09:46:30 +00:00
|
|
|
grub_gfxterm_background_image_cmd (grub_extcmd_t cmd __attribute__ ((unused)),
|
2008-01-01 12:02:07 +00:00
|
|
|
int argc,
|
|
|
|
char **args)
|
|
|
|
{
|
2009-11-20 09:46:30 +00:00
|
|
|
struct grub_arg_list *state = cmd->state;
|
|
|
|
|
2008-01-01 12:02:07 +00:00
|
|
|
/* Check that we have video adapter active. */
|
|
|
|
if (grub_video_get_info(NULL) != GRUB_ERR_NONE)
|
|
|
|
return grub_errno;
|
2009-06-10 21:04:23 +00:00
|
|
|
|
2008-01-01 12:02:07 +00:00
|
|
|
/* Destroy existing background bitmap if loaded. */
|
|
|
|
if (bitmap)
|
|
|
|
{
|
|
|
|
grub_video_bitmap_destroy (bitmap);
|
|
|
|
bitmap = 0;
|
2009-06-10 21:04:23 +00:00
|
|
|
|
2008-01-01 12:02:07 +00:00
|
|
|
/* Mark whole screen as dirty. */
|
2009-11-14 23:03:03 +00:00
|
|
|
dirty_region_add (0, 0, window.width, window.height);
|
2008-01-01 12:02:07 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* If filename was provided, try to load that. */
|
|
|
|
if (argc >= 1)
|
|
|
|
{
|
|
|
|
/* Try to load new one. */
|
2009-06-10 21:04:23 +00:00
|
|
|
grub_video_bitmap_load (&bitmap, args[0]);
|
2008-01-01 12:02:07 +00:00
|
|
|
if (grub_errno != GRUB_ERR_NONE)
|
|
|
|
return grub_errno;
|
|
|
|
|
2009-11-20 09:46:30 +00:00
|
|
|
/* Determine if the bitmap should be scaled to fit the screen. */
|
|
|
|
if (!state[BACKGROUND_CMD_ARGINDEX_MODE].set
|
|
|
|
|| grub_strcmp (state[BACKGROUND_CMD_ARGINDEX_MODE].arg,
|
|
|
|
"stretch") == 0)
|
|
|
|
{
|
2009-11-14 23:03:03 +00:00
|
|
|
if (window.width != grub_video_bitmap_get_width (bitmap)
|
|
|
|
|| window.height != grub_video_bitmap_get_height (bitmap))
|
2009-11-20 09:46:30 +00:00
|
|
|
{
|
|
|
|
struct grub_video_bitmap *scaled_bitmap;
|
|
|
|
grub_video_bitmap_create_scaled (&scaled_bitmap,
|
2009-11-14 23:03:03 +00:00
|
|
|
window.width,
|
|
|
|
window.height,
|
2009-11-20 09:46:30 +00:00
|
|
|
bitmap,
|
|
|
|
GRUB_VIDEO_BITMAP_SCALE_METHOD_BEST);
|
|
|
|
if (grub_errno == GRUB_ERR_NONE)
|
|
|
|
{
|
|
|
|
/* Replace the original bitmap with the scaled one. */
|
|
|
|
grub_video_bitmap_destroy (bitmap);
|
|
|
|
bitmap = scaled_bitmap;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-01-01 12:02:07 +00:00
|
|
|
/* If bitmap was loaded correctly, display it. */
|
|
|
|
if (bitmap)
|
|
|
|
{
|
|
|
|
/* Determine bitmap dimensions. */
|
|
|
|
bitmap_width = grub_video_bitmap_get_width (bitmap);
|
2009-11-14 23:03:03 +00:00
|
|
|
bitmap_height = grub_video_bitmap_get_height (bitmap);
|
2009-06-10 21:04:23 +00:00
|
|
|
|
2008-01-01 12:02:07 +00:00
|
|
|
/* Mark whole screen as dirty. */
|
2009-11-14 23:03:03 +00:00
|
|
|
dirty_region_add (0, 0, window.width, window.height);
|
2008-01-01 12:02:07 +00:00
|
|
|
}
|
|
|
|
}
|
2009-06-10 21:04:23 +00:00
|
|
|
|
2008-01-01 12:02:07 +00:00
|
|
|
/* All was ok. */
|
|
|
|
grub_errno = GRUB_ERR_NONE;
|
|
|
|
return grub_errno;
|
|
|
|
}
|
|
|
|
|
2008-11-07 Robert Millan <rmh@aybabtu.com>
Modularize at_keyboard.mod:
* conf/i386.rmk (pkglib_MODULES): Add `at_keyboard.mod'.
(at_keyboard_mod_SOURCES, at_keyboard_mod_CFLAGS)
(at_keyboard_mod_LDFLAGS): New variables.
Actual terminal split:
* include/grub/term.h (struct grub_term): Split in ...
(struct grub_term_input): ... this, and ...
(struct grub_term_output): ... this. Update all users.
(grub_term_set_current): Split in ...
(grub_term_set_current_input): ... this, and ...
(grub_term_set_current_output): ... this.
(grub_term_get_current): Split in ...
(grub_term_get_current_input): ... this, and ...
(grub_term_get_current_output): ... this.
(grub_term_register): Split in ...
(grub_term_register_input): ... this, and ...
(grub_term_register_output): ... this.
(grub_term_unregister): Split in ...
(grub_term_unregister_input): ... this, and ...
(grub_term_unregister_output): ... this.
(grub_term_iterate): Split in ...
(grub_term_iterate_input): ... this, and ...
(grub_term_iterate_output): ... this.
* kern/term.c (grub_term_list): Split in ...
(grub_term_list_input): ... this, and ...
(grub_term_list_output): ... this. Update all users.
(grub_cur_term): Split in ...
(grub_cur_term_input): ... this, and ...
(grub_cur_term_output): ... this. Update all users.
(grub_term_set_current): Split in ...
(grub_term_set_current_input): ... this, and ...
(grub_term_set_current_output): ... this.
(grub_term_get_current): Split in ...
(grub_term_get_current_input): ... this, and ...
(grub_term_get_current_output): ... this.
(grub_term_register): Split in ...
(grub_term_register_input): ... this, and ...
(grub_term_register_output): ... this.
(grub_term_unregister): Split in ...
(grub_term_unregister_input): ... this, and ...
(grub_term_unregister_output): ... this.
(grub_term_iterate): Split in ...
(grub_term_iterate_input): ... this, and ...
(grub_term_iterate_output): ... this.
* kern/misc.c (grub_abort): Split use of grub_term_get_current() into
a check for input and one for output (and only attempt to get keys
from user when input works).
* util/grub-probe.c (grub_term_get_current): Split in ...
(grub_term_get_current_input): ... this, and ...
(grub_term_get_current_output): ... this.
* util/grub-fstest.c: Likewise.
* util/i386/pc/grub-setup.c: Likewise.
* util/grub-editenv.c: Likewise.
Portability adjustments:
* conf/i386-ieee1275.rmk (kernel_elf_SOURCES): Remove
`term/i386/pc/at_keyboard.c'.
* kern/ieee1275/init.c [__i386__] (grub_machine_init): Remove call to
grub_keyboard_controller_init() (now handled by terminal .init).
* kern/i386/coreboot/init.c (grub_machine_init): Add call to
grub_at_keyboard_init().
* include/grub/i386/ieee1275/console.h (grub_keyboard_controller_init)
(grub_console_checkkey, grub_console_getkey): Remove (now provided by
at_keyboard.mod via input terminal interface).
* include/grub/i386/coreboot/console.h: Convert into a stub for
`<grub/i386/pc/console.h>'.
Migrate full terminals to new API:
* term/efi/console.c (grub_console_term): Split into ...
(grub_console_term_input): ... this, and ...
(grub_console_term_output): ... this. Update all users.
* term/ieee1275/ofconsole.c: Remove __i386__ hack.
(grub_ofconsole_init): Split into ...
(grub_ofconsole_init_input): ... this, and ...
(grub_ofconsole_init_output): ... this.
(grub_ofconsole_term): Split into ...
(grub_ofconsole_term_input): ... this, and ...
(grub_ofconsole_term_output): ... this. Update all users.
* term/i386/pc/serial.c (grub_serial_term): Split into ...
(grub_serial_term_input): ... this, and ...
(grub_serial_term_output): ... this. Update all users.
* term/i386/pc/console.c (grub_console_term): Split into ...
(grub_console_term_input): ... this, and ...
(grub_console_term_output): ... this. Update all users.
(grub_console_term_input): Only enable it on PC/BIOS platform.
(grub_console_init): Remove grub_keyboard_controller_init() call.
Migrate input terminals to new API:
* term/i386/pc/at_keyboard.c: Replace `cpu' and `machine' with
`i386' and `i386/pc' to enable build on x86_64 (this driver is
i386-specific anyway).
(grub_console_checkkey): Rename to ...
(grub_at_keyboard_checkkey): ... this. Static-ize. Update all
users.
(grub_keyboard_controller_orig): New variable.
(grub_console_getkey): Rename to ...
(grub_at_keyboard_getkey): ... this. Static-ize. Update all
users.
(grub_keyboard_controller_init): Static-ize. Save original
controller value so that it can be restored ...
(grub_keyboard_controller_fini): ... here (new function).
(grub_at_keyboard_term): New structure.
(GRUB_MOD_INIT(at_keyboard), GRUB_MOD_FINI(at_keyboard)): New
functions.
Migrate output terminals to new API:
* term/i386/pc/vga.c (grub_vga_term): Change type to
`struct grub_term_output'. Remove `.checkkey' and `.getkey'
members. Update all users.
* term/gfxterm.c (grub_video_term): Change type to
`struct grub_term_output'. Remove `.checkkey' and `.getkey'
members. Update all users.
* include/grub/i386/pc/console.h (grub_console_checkkey)
(grub_console_getkey): Do not export (no longer needed by gfxterm,
etc).
Migrate `terminal' command and userland tools to new API:
* commands/terminal.c (grub_cmd_terminal): Split into ...
(grub_cmd_terminal_input): ... this, and ...
(grub_cmd_terminal_output): ... this.
(GRUB_MOD_INIT(terminal)): Split `terminal' command in two commands:
`terminal_input' and `terminal_output'.
* util/grub.d/00_header.in: Adjust `terminal' calls to new
`terminal_input' / `terminal_output' API.
* util/grub-mkconfig.in: Export ${GRUB_TERMINAL_INPUT} and
${GRUB_TERMINAL_OUTPUT} instead of ${GRUB_TERMINAL} (and if user
provided ${GRUB_TERMINAL}, convert it).
2008-11-07 19:11:39 +00:00
|
|
|
static struct grub_term_output grub_video_term =
|
2006-03-14 19:08:34 +00:00
|
|
|
{
|
|
|
|
.name = "gfxterm",
|
2010-02-07 01:07:35 +00:00
|
|
|
.init = grub_gfxterm_term_init,
|
|
|
|
.fini = grub_gfxterm_term_fini,
|
2006-03-14 19:08:34 +00:00
|
|
|
.putchar = grub_gfxterm_putchar,
|
|
|
|
.getcharwidth = grub_gfxterm_getcharwidth,
|
|
|
|
.getwh = grub_virtual_screen_getwh,
|
|
|
|
.getxy = grub_virtual_screen_getxy,
|
|
|
|
.gotoxy = grub_gfxterm_gotoxy,
|
|
|
|
.cls = grub_gfxterm_cls,
|
|
|
|
.setcolorstate = grub_virtual_screen_setcolorstate,
|
2008-01-01 12:02:07 +00:00
|
|
|
.setcolor = grub_virtual_screen_setcolor,
|
|
|
|
.getcolor = grub_virtual_screen_getcolor,
|
2006-03-14 19:08:34 +00:00
|
|
|
.setcursor = grub_gfxterm_setcursor,
|
2006-07-31 14:21:36 +00:00
|
|
|
.refresh = grub_gfxterm_refresh,
|
2010-03-16 18:23:21 +00:00
|
|
|
.flags = GRUB_TERM_CODE_TYPE_VISUAL_GLYPHS,
|
2006-03-14 19:08:34 +00:00
|
|
|
.next = 0
|
|
|
|
};
|
|
|
|
|
2009-11-20 09:46:30 +00:00
|
|
|
static grub_extcmd_t background_image_cmd_handle;
|
2009-03-21 Bean <bean123ch@gmail.com>
* 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.
2009-03-21 08:39:59 +00:00
|
|
|
|
2010-02-07 01:07:35 +00:00
|
|
|
GRUB_MOD_INIT(gfxterm)
|
2006-03-14 19:08:34 +00:00
|
|
|
{
|
2009-04-14 18:12:14 +00:00
|
|
|
grub_term_register_output ("gfxterm", &grub_video_term);
|
2009-11-20 09:46:30 +00:00
|
|
|
background_image_cmd_handle =
|
|
|
|
grub_register_extcmd ("background_image",
|
|
|
|
grub_gfxterm_background_image_cmd,
|
|
|
|
GRUB_COMMAND_FLAG_BOTH,
|
2010-01-05 15:34:10 +00:00
|
|
|
"[-m (stretch|normal)] FILE",
|
2009-11-20 09:46:30 +00:00
|
|
|
"Load background image for active terminal.",
|
|
|
|
background_image_cmd_options);
|
2006-03-14 19:08:34 +00:00
|
|
|
}
|
|
|
|
|
2010-02-07 01:07:35 +00:00
|
|
|
GRUB_MOD_FINI(gfxterm)
|
2006-03-14 19:08:34 +00:00
|
|
|
{
|
2009-11-20 09:46:30 +00:00
|
|
|
grub_unregister_extcmd (background_image_cmd_handle);
|
2008-11-07 Robert Millan <rmh@aybabtu.com>
Modularize at_keyboard.mod:
* conf/i386.rmk (pkglib_MODULES): Add `at_keyboard.mod'.
(at_keyboard_mod_SOURCES, at_keyboard_mod_CFLAGS)
(at_keyboard_mod_LDFLAGS): New variables.
Actual terminal split:
* include/grub/term.h (struct grub_term): Split in ...
(struct grub_term_input): ... this, and ...
(struct grub_term_output): ... this. Update all users.
(grub_term_set_current): Split in ...
(grub_term_set_current_input): ... this, and ...
(grub_term_set_current_output): ... this.
(grub_term_get_current): Split in ...
(grub_term_get_current_input): ... this, and ...
(grub_term_get_current_output): ... this.
(grub_term_register): Split in ...
(grub_term_register_input): ... this, and ...
(grub_term_register_output): ... this.
(grub_term_unregister): Split in ...
(grub_term_unregister_input): ... this, and ...
(grub_term_unregister_output): ... this.
(grub_term_iterate): Split in ...
(grub_term_iterate_input): ... this, and ...
(grub_term_iterate_output): ... this.
* kern/term.c (grub_term_list): Split in ...
(grub_term_list_input): ... this, and ...
(grub_term_list_output): ... this. Update all users.
(grub_cur_term): Split in ...
(grub_cur_term_input): ... this, and ...
(grub_cur_term_output): ... this. Update all users.
(grub_term_set_current): Split in ...
(grub_term_set_current_input): ... this, and ...
(grub_term_set_current_output): ... this.
(grub_term_get_current): Split in ...
(grub_term_get_current_input): ... this, and ...
(grub_term_get_current_output): ... this.
(grub_term_register): Split in ...
(grub_term_register_input): ... this, and ...
(grub_term_register_output): ... this.
(grub_term_unregister): Split in ...
(grub_term_unregister_input): ... this, and ...
(grub_term_unregister_output): ... this.
(grub_term_iterate): Split in ...
(grub_term_iterate_input): ... this, and ...
(grub_term_iterate_output): ... this.
* kern/misc.c (grub_abort): Split use of grub_term_get_current() into
a check for input and one for output (and only attempt to get keys
from user when input works).
* util/grub-probe.c (grub_term_get_current): Split in ...
(grub_term_get_current_input): ... this, and ...
(grub_term_get_current_output): ... this.
* util/grub-fstest.c: Likewise.
* util/i386/pc/grub-setup.c: Likewise.
* util/grub-editenv.c: Likewise.
Portability adjustments:
* conf/i386-ieee1275.rmk (kernel_elf_SOURCES): Remove
`term/i386/pc/at_keyboard.c'.
* kern/ieee1275/init.c [__i386__] (grub_machine_init): Remove call to
grub_keyboard_controller_init() (now handled by terminal .init).
* kern/i386/coreboot/init.c (grub_machine_init): Add call to
grub_at_keyboard_init().
* include/grub/i386/ieee1275/console.h (grub_keyboard_controller_init)
(grub_console_checkkey, grub_console_getkey): Remove (now provided by
at_keyboard.mod via input terminal interface).
* include/grub/i386/coreboot/console.h: Convert into a stub for
`<grub/i386/pc/console.h>'.
Migrate full terminals to new API:
* term/efi/console.c (grub_console_term): Split into ...
(grub_console_term_input): ... this, and ...
(grub_console_term_output): ... this. Update all users.
* term/ieee1275/ofconsole.c: Remove __i386__ hack.
(grub_ofconsole_init): Split into ...
(grub_ofconsole_init_input): ... this, and ...
(grub_ofconsole_init_output): ... this.
(grub_ofconsole_term): Split into ...
(grub_ofconsole_term_input): ... this, and ...
(grub_ofconsole_term_output): ... this. Update all users.
* term/i386/pc/serial.c (grub_serial_term): Split into ...
(grub_serial_term_input): ... this, and ...
(grub_serial_term_output): ... this. Update all users.
* term/i386/pc/console.c (grub_console_term): Split into ...
(grub_console_term_input): ... this, and ...
(grub_console_term_output): ... this. Update all users.
(grub_console_term_input): Only enable it on PC/BIOS platform.
(grub_console_init): Remove grub_keyboard_controller_init() call.
Migrate input terminals to new API:
* term/i386/pc/at_keyboard.c: Replace `cpu' and `machine' with
`i386' and `i386/pc' to enable build on x86_64 (this driver is
i386-specific anyway).
(grub_console_checkkey): Rename to ...
(grub_at_keyboard_checkkey): ... this. Static-ize. Update all
users.
(grub_keyboard_controller_orig): New variable.
(grub_console_getkey): Rename to ...
(grub_at_keyboard_getkey): ... this. Static-ize. Update all
users.
(grub_keyboard_controller_init): Static-ize. Save original
controller value so that it can be restored ...
(grub_keyboard_controller_fini): ... here (new function).
(grub_at_keyboard_term): New structure.
(GRUB_MOD_INIT(at_keyboard), GRUB_MOD_FINI(at_keyboard)): New
functions.
Migrate output terminals to new API:
* term/i386/pc/vga.c (grub_vga_term): Change type to
`struct grub_term_output'. Remove `.checkkey' and `.getkey'
members. Update all users.
* term/gfxterm.c (grub_video_term): Change type to
`struct grub_term_output'. Remove `.checkkey' and `.getkey'
members. Update all users.
* include/grub/i386/pc/console.h (grub_console_checkkey)
(grub_console_getkey): Do not export (no longer needed by gfxterm,
etc).
Migrate `terminal' command and userland tools to new API:
* commands/terminal.c (grub_cmd_terminal): Split into ...
(grub_cmd_terminal_input): ... this, and ...
(grub_cmd_terminal_output): ... this.
(GRUB_MOD_INIT(terminal)): Split `terminal' command in two commands:
`terminal_input' and `terminal_output'.
* util/grub.d/00_header.in: Adjust `terminal' calls to new
`terminal_input' / `terminal_output' API.
* util/grub-mkconfig.in: Export ${GRUB_TERMINAL_INPUT} and
${GRUB_TERMINAL_OUTPUT} instead of ${GRUB_TERMINAL} (and if user
provided ${GRUB_TERMINAL}, convert it).
2008-11-07 19:11:39 +00:00
|
|
|
grub_term_unregister_output (&grub_video_term);
|
2006-03-14 19:08:34 +00:00
|
|
|
}
|