aboutsummaryrefslogtreecommitdiff
path: root/ui/console.c
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2013-03-12 13:44:38 +0100
committerGerd Hoffmann <kraxel@redhat.com>2013-04-16 09:03:48 +0200
commit1dbfa005032d4fa5d7a5242da856d3487c907431 (patch)
tree511de9d82785cdd3bfa5528911dd9ff62073bac3 /ui/console.c
parent64840c66b702cc4c809c72d8ad5d26861dd7fd8d (diff)
downloadqemu-arm-1dbfa005032d4fa5d7a5242da856d3487c907431.tar.gz
console: rename vga_hw_*, add QemuConsole param
Add QemuConsole parameter to vga_hw_*, so the interface allows to update non-active consoles (the actual code can't handle this yet, see next patch). Passing NULL is allowed and updates the active console, like the functions do today. While touching all vga_hw_* calls anyway rename that to the functions to hardware-neutral graphics_hw_* Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'ui/console.c')
-rw-r--r--ui/console.c49
1 files changed, 30 insertions, 19 deletions
diff --git a/ui/console.c b/ui/console.c
index e100593ffd..dccc61850b 100644
--- a/ui/console.c
+++ b/ui/console.c
@@ -118,10 +118,10 @@ struct QemuConsole {
DisplayState *ds;
/* Graphic console state. */
- vga_hw_update_ptr hw_update;
- vga_hw_invalidate_ptr hw_invalidate;
- vga_hw_screen_dump_ptr hw_screen_dump;
- vga_hw_text_update_ptr hw_text_update;
+ graphic_hw_update_ptr hw_update;
+ graphic_hw_invalidate_ptr hw_invalidate;
+ graphic_hw_screen_dump_ptr hw_screen_dump;
+ graphic_hw_text_update_ptr hw_text_update;
void *hw;
int g_width, g_height;
@@ -165,16 +165,24 @@ static int nb_consoles = 0;
static void text_console_do_init(CharDriverState *chr, DisplayState *ds);
-void vga_hw_update(void)
+void graphic_hw_update(QemuConsole *con)
{
- if (active_console && active_console->hw_update)
- active_console->hw_update(active_console->hw);
+ if (!con) {
+ con = active_console;
+ }
+ if (con && con->hw_update) {
+ con->hw_update(con->hw);
+ }
}
-void vga_hw_invalidate(void)
+void graphic_hw_invalidate(QemuConsole *con)
{
- if (active_console && active_console->hw_invalidate)
- active_console->hw_invalidate(active_console->hw);
+ if (!con) {
+ con = active_console;
+ }
+ if (con && con->hw_invalidate) {
+ con->hw_invalidate(con->hw);
+ }
}
void qmp_screendump(const char *filename, Error **errp)
@@ -201,10 +209,13 @@ void qmp_screendump(const char *filename, Error **errp)
}
}
-void vga_hw_text_update(console_ch_t *chardata)
+void graphic_hw_text_update(QemuConsole *con, console_ch_t *chardata)
{
- if (active_console && active_console->hw_text_update)
- active_console->hw_text_update(active_console->hw, chardata);
+ if (!con) {
+ con = active_console;
+ }
+ if (con && con->hw_text_update)
+ con->hw_text_update(con->hw, chardata);
}
static void vga_fill_rect(QemuConsole *con,
@@ -932,7 +943,7 @@ void console_select(unsigned int index)
qemu_mod_timer(s->cursor_timer,
qemu_get_clock_ms(rt_clock) + CONSOLE_CURSOR_PERIOD / 2);
}
- vga_hw_invalidate();
+ graphic_hw_invalidate(s);
}
}
@@ -1359,10 +1370,10 @@ DisplayState *init_displaystate(void)
return display_state;
}
-QemuConsole *graphic_console_init(vga_hw_update_ptr update,
- vga_hw_invalidate_ptr invalidate,
- vga_hw_screen_dump_ptr screen_dump,
- vga_hw_text_update_ptr text_update,
+QemuConsole *graphic_console_init(graphic_hw_update_ptr update,
+ graphic_hw_invalidate_ptr invalidate,
+ graphic_hw_screen_dump_ptr screen_dump,
+ graphic_hw_text_update_ptr text_update,
void *opaque)
{
int width = 640;
@@ -1407,7 +1418,7 @@ static void text_console_update_cursor(void *opaque)
QemuConsole *s = opaque;
s->cursor_visible_phase = !s->cursor_visible_phase;
- vga_hw_invalidate();
+ graphic_hw_invalidate(s);
qemu_mod_timer(s->cursor_timer,
qemu_get_clock_ms(rt_clock) + CONSOLE_CURSOR_PERIOD / 2);
}