2005-08-04 Marco Gerards <metgerards@student.han.nl>
* kern/term.c (grub_putcode): Use `grub_getwh' instead of hardcoded value. From Vincent Pelletier <subdino2004@yahoo.fr> * include/grub/term.h (GRUB_TERM_WIDTH, GRUB_TERM_HEIGHT): Redefined to use grub_getwh. (grub_term): New member named getwh. (grub_getwh): New prototype. * kern/term.c (grub_getwh): New function. * term/i386/pc/console.c (grub_console_getwh): New function. (grub_console_term): New member `getwh'. * term/i386/pc/vga.c (grub_vga_getwh): New function. (grub_vga_term): New member `getwh'. * term/sparc64/ofconsole.c (grub_ofconsole_readkey): Use grub_ssize_t. (grub_ofconsole_getw): New function. (grub_ofconsole_init): Use grub_ssize_t and unsigned char. (grub_ofconsole_term): New field named getwh and new initial value.
This commit is contained in:
parent
3be7266d92
commit
267f6cd9ca
6 changed files with 114 additions and 13 deletions
|
@ -74,6 +74,12 @@ grub_console_putchar (grub_uint32_t c)
|
|||
grub_console_real_putchar (c);
|
||||
}
|
||||
|
||||
static grub_uint16_t
|
||||
grub_console_getwh (void)
|
||||
{
|
||||
return (80 << 8) | 25;
|
||||
}
|
||||
|
||||
static void
|
||||
grub_console_setcolorstate (grub_term_color_state state)
|
||||
{
|
||||
|
@ -107,6 +113,7 @@ static struct grub_term grub_console_term =
|
|||
.putchar = grub_console_putchar,
|
||||
.checkkey = grub_console_checkkey,
|
||||
.getkey = grub_console_getkey,
|
||||
.getwh = grub_console_getwh,
|
||||
.getxy = grub_console_getxy,
|
||||
.gotoxy = grub_console_gotoxy,
|
||||
.cls = grub_console_cls,
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
/*
|
||||
* GRUB -- GRand Unified Bootloader
|
||||
* Copyright (C) 2000,2001,2002,2003,2004 Free Software Foundation, Inc.
|
||||
* Copyright (C) 2000,2001,2002,2003,2004,2005 Free Software Foundation, Inc.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
@ -472,6 +472,12 @@ grub_vga_putchar (grub_uint32_t c)
|
|||
#endif
|
||||
}
|
||||
|
||||
static grub_uint16_t
|
||||
grub_vga_getwh (void)
|
||||
{
|
||||
return (TEXT_WIDTH << 8) | TEXT_HEIGHT;
|
||||
}
|
||||
|
||||
static grub_uint16_t
|
||||
grub_vga_getxy (void)
|
||||
{
|
||||
|
@ -566,6 +572,7 @@ static struct grub_term grub_vga_term =
|
|||
.putchar = grub_vga_putchar,
|
||||
.checkkey = grub_console_checkkey,
|
||||
.getkey = grub_console_getkey,
|
||||
.getwh = grub_vga_getwh,
|
||||
.getxy = grub_vga_getxy,
|
||||
.gotoxy = grub_vga_gotoxy,
|
||||
.cls = grub_vga_cls,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue