diff options
| author | aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162> | 2009-03-05 23:01:47 +0000 |
|---|---|---|
| committer | aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162> | 2009-03-05 23:01:47 +0000 |
| commit | 2724b1806a63d66148cea62e1fe1cae3b417bc7e (patch) | |
| tree | 4358154ee5b4d54dd14fbcd9a70a63a25e5defab /qemu-char.c | |
| parent | 731b03642d0ac0365294c7b39713fede769a3f39 (diff) | |
| download | qemu-2724b1806a63d66148cea62e1fe1cae3b417bc7e.tar.gz qemu-2724b1806a63d66148cea62e1fe1cae3b417bc7e.tar.bz2 qemu-2724b1806a63d66148cea62e1fe1cae3b417bc7e.zip | |
monitor: Improve mux'ed console experience (Jan Kiszka)
Up to now, you never really knew if you already switched the console
after pressing CTRL-A C or if you mistyped it again. This patch
clarifies the situation by providing a prompt in a new line and
injecting a linebreak when switching away again. For this purpose, the
two events CHR_EVENT_MUX_IN and CHR_EVENT_MUX_OUT are introduced and
distributed on focus switches.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6716 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'qemu-char.c')
| -rw-r--r-- | qemu-char.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/qemu-char.c b/qemu-char.c index f81564624a..8c5544c27b 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -310,6 +310,12 @@ static void mux_print_help(CharDriverState *chr) } } +static void mux_chr_send_event(MuxDriver *d, int mux_nr, int event) +{ + if (d->chr_event[mux_nr]) + d->chr_event[mux_nr](d->ext_opaque[mux_nr], event); +} + static int mux_proc_byte(CharDriverState *chr, MuxDriver *d, int ch) { if (d->term_got_escape) { @@ -341,9 +347,11 @@ static int mux_proc_byte(CharDriverState *chr, MuxDriver *d, int ch) break; case 'c': /* Switch to the next registered device */ + mux_chr_send_event(d, chr->focus, CHR_EVENT_MUX_OUT); chr->focus++; if (chr->focus >= d->mux_cnt) chr->focus = 0; + mux_chr_send_event(d, chr->focus, CHR_EVENT_MUX_IN); break; case 't': term_timestamps = !term_timestamps; @@ -413,8 +421,7 @@ static void mux_chr_event(void *opaque, int event) /* Send the event to all registered listeners */ for (i = 0; i < d->mux_cnt; i++) - if (d->chr_event[i]) - d->chr_event[i](d->ext_opaque[i], event); + mux_chr_send_event(d, i, event); } static void mux_chr_update_read_handler(CharDriverState *chr) |