From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=55772 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PVkVS-0006GV-CN for qemu-devel@nongnu.org; Thu, 23 Dec 2010 07:42:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PVkVR-0000nm-CX for qemu-devel@nongnu.org; Thu, 23 Dec 2010 07:42:54 -0500 Received: from mail-ww0-f53.google.com ([74.125.82.53]:62702) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PVkVR-0000nZ-7g for qemu-devel@nongnu.org; Thu, 23 Dec 2010 07:42:53 -0500 Received: by wwi18 with SMTP id 18so5979050wwi.10 for ; Thu, 23 Dec 2010 04:42:52 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Thu, 23 Dec 2010 13:42:52 +0100 Message-Id: <1293108174-24895-7-git-send-email-pbonzini@redhat.com> In-Reply-To: <1293108174-24895-1-git-send-email-pbonzini@redhat.com> References: <1293108174-24895-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 6/8] add set_echo implementation for text consoles List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Signed-off-by: Paolo Bonzini --- console.c | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/console.c b/console.c index 42c2ee3..60b80ee 100644 --- a/console.c +++ b/console.c @@ -137,6 +137,7 @@ struct TextConsole { TextAttributes t_attrib; /* currently active text attributes */ TextCell *cells; int text_x[2], text_y[2], cursor_invalidate; + int echo; int update_x0; int update_y0; @@ -1177,8 +1178,14 @@ void kbd_put_keysym(int keysym) *q++ = '\033'; *q++ = '['; *q++ = keysym & 0xff; + } else if (s->echo && (keysym == '\r' || keysym == '\n')) { + console_puts(s->chr, (const uint8_t *) "\r", 1); + *q++ = '\n'; } else { - *q++ = keysym; + *q++ = keysym; + } + if (s->echo) { + console_puts(s->chr, buf, q - buf); } if (s->chr->chr_read) { qemu_fifo_write(&s->out_fifo, buf, q - buf); @@ -1432,6 +1439,13 @@ static int n_text_consoles; static CharDriverState *text_consoles[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) { TextConsole *s; @@ -1532,6 +1546,7 @@ CharDriverState *text_console_init(QemuOpts *opts) s->g_width = width; s->g_height = height; chr->opaque = s; + chr->chr_set_echo = text_console_set_echo; return chr; } -- 1.7.3.2