2005-10-15 Yoshinori K. Okuji <okuji@enbug.org>
* fs/xfs.c (grub_xfs_iterate_dir): Change the type of BLK to grub_uint64_t. Call the hook with a NUL-terminated filename. (grub_xfs_mount): Use grub_be_to_cpu32 instead of grub_cpu_to_be32. * kern/term.c (cursor_state): New variable. (grub_term_set_current): Reset the cursor state on a new terminal. (grub_setcursor): Rewritten to use CURSOR_STATE. (grub_getcursor): New function. * include/grub/term.h (grub_getcursor): New prototype. * io/gzio.c (test_header): Align BUF for accessing it as 32-bit integers on ARM. Reported by Timothy Baldwin <T.E.Baldwin99@members.leeds.ac.uk>.
This commit is contained in:
parent
bb34586ca6
commit
688e5699e6
5 changed files with 51 additions and 15 deletions
15
kern/term.c
15
kern/term.c
|
@ -34,6 +34,9 @@ static int grub_more_lines;
|
|||
/* If the more pager is active. */
|
||||
static int grub_more;
|
||||
|
||||
/* The current cursor state. */
|
||||
static int cursor_state = 1;
|
||||
|
||||
void
|
||||
grub_term_register (grub_term_t term)
|
||||
{
|
||||
|
@ -77,6 +80,7 @@ grub_term_set_current (grub_term_t term)
|
|||
|
||||
grub_cur_term = term;
|
||||
grub_cls ();
|
||||
grub_setcursor (grub_getcursor ());
|
||||
return GRUB_ERR_NONE;
|
||||
}
|
||||
|
||||
|
@ -229,18 +233,23 @@ grub_setcolor (grub_uint8_t normal_color, grub_uint8_t highlight_color)
|
|||
int
|
||||
grub_setcursor (int on)
|
||||
{
|
||||
static int prev = 1;
|
||||
int ret = prev;
|
||||
int ret = cursor_state;
|
||||
|
||||
if (grub_cur_term->setcursor)
|
||||
{
|
||||
(grub_cur_term->setcursor) (on);
|
||||
prev = on;
|
||||
cursor_state = on;
|
||||
}
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
int
|
||||
grub_getcursor (void)
|
||||
{
|
||||
return cursor_state;
|
||||
}
|
||||
|
||||
void
|
||||
grub_refresh (void)
|
||||
{
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue