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

FORALL_ACTIVE_TERM_OUTPUTS macro

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2009-12-24 17:51:43 +01:00
parent 8eca55a6eb
commit 3be7f8de12
8 changed files with 106 additions and 121 deletions
Download patch file Download diff file Expand all files Collapse all files

25
normal/term.c
View file

@ -32,8 +32,8 @@ process_newline (void)
struct grub_term_output *cur;
unsigned height = -1;
for (cur = grub_term_outputs; cur; cur = cur->next)
if (grub_term_is_active(cur) && grub_term_height (cur) < height)
FOR_ACTIVE_TERM_OUTPUTS(cur)
if (grub_term_height (cur) < height)
height = grub_term_height (cur);
grub_more_lines++;
@ -98,18 +98,16 @@ grub_term_save_pos (void)
unsigned cnt = 0;
grub_uint16_t *ret, *ptr;
for (cur = grub_term_outputs; cur; cur = cur->next)
if (grub_term_is_active (cur))
cnt++;
FOR_ACTIVE_TERM_OUTPUTS(cur)
cnt++;
ret = grub_malloc (cnt * sizeof (ret[0]));
if (!ret)
return NULL;
ptr = ret;
for (cur = grub_term_outputs; cur; cur = cur->next)
if (grub_term_is_active (cur))
*ptr++ = grub_term_getxy (cur);
FOR_ACTIVE_TERM_OUTPUTS(cur)
*ptr++ = grub_term_getxy (cur);
return ret;
}
@ -123,10 +121,9 @@ grub_term_restore_pos (grub_uint16_t *pos)
if (!pos)
return;
for (cur = grub_term_outputs; cur; cur = cur->next)
if (grub_term_is_active (cur))
{
grub_term_gotoxy (cur, (*ptr & 0xff00) >> 8, *ptr & 0xff);
ptr++;
}
FOR_ACTIVE_TERM_OUTPUTS(cur)
{
grub_term_gotoxy (cur, (*ptr & 0xff00) >> 8, *ptr & 0xff);
ptr++;
}
}