vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

2010-01-01 Carles Pina i Estany <carles@pina.cat>

Browse source 
* commands/help.c: Include `grub/mm.h' and `grub/normal.h'.
	(grub_cmd_help): Print the cmd->name before the cmd->summary. Cut the
	string using string width.
	* normal/menu_text.c (grub_print_message_indented): Use
	grub_print_spaces and not print_spaces.
	(print_timeout): Likewise.
	(print_spaces): Move to...
	* include/grub/term.h: ... here. Change the name to grub_print_spaces.
This commit is contained in:
carles 2010-01-01 18:58:00 +01:00
parent 3fd3b8d81a
commit 3393790450
4 changed files with 62 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

14
normal/menu_text.c
View file

@ -45,14 +45,6 @@ grub_wait_after_message (void)
grub_putchar ('\n');
}
static void
print_spaces (int number_spaces)
{
int i;
for (i = 0; i < number_spaces; i++)
grub_putchar (' ');
}
void
grub_print_ucs4 (const grub_uint32_t * str,
const grub_uint32_t * last_position)
@ -149,7 +141,7 @@ grub_print_message_indented (const char *msg, int margin_left, int margin_right)
(grub_uint32_t *) last_position : next_new_line + line_len;
}
print_spaces (margin_left);
grub_print_spaces (margin_left);
grub_print_ucs4 (current_position, next_new_line);
next_new_line++;
@ -405,7 +397,7 @@ print_timeout (int timeout, int offset)
int posx;
posx = grub_getxy() >> 8;
print_spaces (GRUB_TERM_WIDTH - posx - 1);
grub_print_spaces (GRUB_TERM_WIDTH - posx - 1);
grub_gotoxy (GRUB_TERM_CURSOR_X, GRUB_TERM_FIRST_ENTRY_Y + offset);
grub_refresh ();
@ -495,7 +487,7 @@ run_menu (grub_menu_t menu, int nested, int *auto_boot)
if (timeout >= 0)
{
grub_gotoxy (0, GRUB_TERM_HEIGHT - 3);
print_spaces (GRUB_TERM_WIDTH - 1);
grub_print_spaces (GRUB_TERM_WIDTH - 1);
grub_env_unset ("timeout");
grub_env_unset ("fallback");