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

Fix few pager bugs

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-03-23 18:06:49 +01:00
parent 3c69fb81e1
commit 5c56cac95f
3 changed files with 25 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/grub/normal.h
View file

@ -113,6 +113,7 @@ void read_terminal_list (void);
void grub_set_more (int onoff); void grub_set_more (int onoff);
int grub_normal_get_char_counter (void); int grub_normal_get_char_counter (void);
void grub_normal_reset_more (void);
void grub_xputs_normal (const char *str); void grub_xputs_normal (const char *str);

3
normal/cmdline.c
View file

@ -362,6 +362,7 @@ grub_cmdline_get (const char *prompt)
grub_putcode ('\n', term); grub_putcode ('\n', term);
} }
grub_printf ("%s ", prompt_translated); grub_printf ("%s ", prompt_translated);
grub_normal_reset_more ();
{ {
struct cmdline_term *cl_term_cur; struct cmdline_term *cl_term_cur;
@ -440,6 +441,8 @@ grub_cmdline_get (const char *prompt)
print_completion); print_completion);
grub_free (bufu8); grub_free (bufu8);
grub_normal_reset_more ();
if (restore) if (restore)
{ {
/* Restore the prompt. */ /* Restore the prompt. */

29
normal/term.c
View file

@ -39,9 +39,6 @@ struct term_state
static struct term_state *term_states = NULL; static struct term_state *term_states = NULL;
/* The amount of lines counted by the pager. */
static unsigned grub_more_lines;
/* If the more pager is active. */ /* If the more pager is active. */
static int grub_more; static int grub_more;
@ -53,6 +50,14 @@ grub_normal_get_char_counter (void)
return grub_normal_char_counter; return grub_normal_char_counter;
} }
void
grub_normal_reset_more (void)
{
static struct term_state *state;
for (state = term_states; state; state = state->next)
state->num_lines = 0;
}
static void static void
print_more (void) print_more (void)
{ {
@ -92,12 +97,12 @@ print_more (void)
/* Scroll one lines or an entire page, depending on the key. */ /* Scroll one lines or an entire page, depending on the key. */
if (key == '\r' || key =='\n')
grub_normal_reset_more ();
else
{ {
static struct term_state *state; static struct term_state *state;
for (state = term_states; state; state = state->next) for (state = term_states; state; state = state->next)
if (key == '\r' || key =='\n')
state->num_lines = 0;
else
state->num_lines -= 2; state->num_lines -= 2;
} }
} }
@ -109,8 +114,7 @@ grub_set_more (int onoff)
grub_more++; grub_more++;
else else
grub_more--; grub_more--;
grub_normal_reset_more ();
grub_more_lines = 0;
} }
static grub_uint32_t static grub_uint32_t
@ -529,8 +533,8 @@ print_ucs4_terminal (const grub_uint32_t * str,
grub_print_spaces (term, margin_right); grub_print_spaces (term, margin_right);
grub_putcode ('\n', term); grub_putcode ('\n', term);
if (state && state->num_lines++ if (state && ++state->num_lines
>= (grub_ssize_t) grub_term_height (term)) >= (grub_ssize_t) grub_term_height (term) - 2)
{ {
state->backlog_ucs4 = (ptr == last_space || *ptr == '\n') state->backlog_ucs4 = (ptr == last_space || *ptr == '\n')
? ptr + 1 : ptr; ? ptr + 1 : ptr;
@ -597,7 +601,8 @@ put_glyphs_terminal (const struct grub_unicode_glyph *visual,
if (visual_ptr->base == '\n') if (visual_ptr->base == '\n')
grub_print_spaces (term, margin_right); grub_print_spaces (term, margin_right);
putglyph (visual_ptr, term); putglyph (visual_ptr, term);
if (state && state->num_lines++ >= (grub_ssize_t) grub_term_height (term)) if (state && ++state->num_lines
>= (grub_ssize_t) grub_term_height (term) - 2)
{ {
state->backlog_glyphs = visual_ptr + 1; state->backlog_glyphs = visual_ptr + 1;
state->backlog_len = visual_len - (visual - visual_ptr) - 1; state->backlog_len = visual_len - (visual - visual_ptr) - 1;
@ -736,7 +741,7 @@ grub_xputs_normal (const char *str)
{ {
int cur; int cur;
cur = print_ucs4_real (unicode_str, unicode_last_position, 0, 0, cur = print_ucs4_real (unicode_str, unicode_last_position, 0, 0,
term, 1); term, grub_more);
if (cur) if (cur)
backlog = 1; backlog = 1;
} }