add set_echo implementation for text consoles

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Paolo Bonzini 2010-12-23 13:42:52 +01:00 committed by Anthony Liguori
parent 491e114a95
commit 4104833f51

View File

@ -137,6 +137,7 @@ struct TextConsole {
TextAttributes t_attrib; /* currently active text attributes */ TextAttributes t_attrib; /* currently active text attributes */
TextCell *cells; TextCell *cells;
int text_x[2], text_y[2], cursor_invalidate; int text_x[2], text_y[2], cursor_invalidate;
int echo;
int update_x0; int update_x0;
int update_y0; int update_y0;
@ -1177,8 +1178,14 @@ void kbd_put_keysym(int keysym)
*q++ = '\033'; *q++ = '\033';
*q++ = '['; *q++ = '[';
*q++ = keysym & 0xff; *q++ = keysym & 0xff;
} else if (s->echo && (keysym == '\r' || keysym == '\n')) {
console_puts(s->chr, (const uint8_t *) "\r", 1);
*q++ = '\n';
} else { } else {
*q++ = keysym; *q++ = keysym;
}
if (s->echo) {
console_puts(s->chr, buf, q - buf);
} }
if (s->chr->chr_read) { if (s->chr->chr_read) {
qemu_fifo_write(&s->out_fifo, buf, q - buf); qemu_fifo_write(&s->out_fifo, buf, q - buf);
@ -1432,6 +1439,13 @@ static int n_text_consoles;
static CharDriverState *text_consoles[128]; static CharDriverState *text_consoles[128];
static QemuOpts *text_console_opts[128]; static QemuOpts *text_console_opts[128];
static void text_console_set_echo(CharDriverState *chr, bool echo)
{
TextConsole *s = chr->opaque;
s->echo = echo;
}
static void text_console_do_init(CharDriverState *chr, DisplayState *ds, QemuOpts *opts) static void text_console_do_init(CharDriverState *chr, DisplayState *ds, QemuOpts *opts)
{ {
TextConsole *s; TextConsole *s;
@ -1532,6 +1546,7 @@ CharDriverState *text_console_init(QemuOpts *opts)
s->g_width = width; s->g_width = width;
s->g_height = height; s->g_height = height;
chr->opaque = s; chr->opaque = s;
chr->chr_set_echo = text_console_set_echo;
return chr; return chr;
} }