[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 6/8] add set_echo implementation for text consoles
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 6/8] add set_echo implementation for text consoles |
Date: |
Thu, 23 Dec 2010 13:42:52 +0100 |
Signed-off-by: Paolo Bonzini <address@hidden>
---
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
- [Qemu-devel] [PATCH 0/8] make -qmp stdio usable, Paolo Bonzini, 2010/12/23
- [Qemu-devel] [PATCH 1/8] remove broken code for tty, Paolo Bonzini, 2010/12/23
- [Qemu-devel] [PATCH 2/8] add qemu_chr_set_echo, Paolo Bonzini, 2010/12/23
- [Qemu-devel] [PATCH 3/8] move atexit(term_exit) and O_NONBLOCK to qemu_chr_open_stdio, Paolo Bonzini, 2010/12/23
- [Qemu-devel] [PATCH 4/8] add set_echo implementation for qemu_chr_stdio, Paolo Bonzini, 2010/12/23
- [Qemu-devel] [PATCH 5/8] create TextConsole together with the CharDeviceState, Paolo Bonzini, 2010/12/23
- [Qemu-devel] [PATCH 6/8] add set_echo implementation for text consoles,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 8/8] fix QemuOpts leak, Paolo Bonzini, 2010/12/23
- [Qemu-devel] [PATCH 7/8] remove text_console_opts, Paolo Bonzini, 2010/12/23