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

Imported nyu's multi-input

Browse source
This commit is contained in:
Robert Millan 2009-12-24 17:08:14 +01:00 • committed by Vladimir 'phcoder' Serbinenko
parent 2322a12693
commit 8eca55a6eb
6 changed files with 54 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

4
kern/misc.c
View file

@ -975,7 +975,9 @@ grub_abort (void)
{
grub_printf ("\nAborted.");
if (grub_term_get_current_input ())
#ifndef GRUB_UTIL
if (grub_term_inputs)
#endif
{
grub_printf (" Press any key to exit.");
grub_getkey ();

48
kern/term.c
View file

@ -21,15 +21,10 @@
#include <grub/mm.h>
#include <grub/misc.h>
#include <grub/env.h>
struct grub_handler_class grub_term_input_class =
{
.name = "terminal_input"
};
#define grub_cur_term_input grub_term_get_current_input ()
#include <grub/cpu/time.h>
struct grub_term_output *grub_term_outputs;
struct grub_term_input *grub_term_inputs;
void (*grub_newline_hook) (void) = NULL;
@ -85,22 +80,49 @@ grub_putchar (int c)
int
grub_getkey (void)
{
return (grub_cur_term_input->getkey) ();
grub_term_input_t term;
while (1)
{
FOR_ACTIVE_TERM_INPUTS(term)
{
int key = term->checkkey ();
if (key != -1)
return term->getkey ();
}
grub_cpu_idle ();
}
}
int
grub_checkkey (void)
{
return (grub_cur_term_input->checkkey) ();
grub_term_input_t term;
FOR_ACTIVE_TERM_INPUTS(term)
{
int key = term->checkkey ();
if (key != -1)
return key;
}
return -1;
}
int
grub_getkeystatus (void)
{
if (grub_cur_term_input->getkeystatus)
return (grub_cur_term_input->getkeystatus) ();
else
return 0;
int status = 0;
grub_term_input_t term;
FOR_ACTIVE_TERM_INPUTS(term)
{
if (term->getkeystatus)
status |= term->getkeystatus ();
}
return status;
}
void