aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--console.c13
-rw-r--r--console.h2
-rw-r--r--hw/cirrus_vga.c10
-rw-r--r--hw/vmware_vga.c2
4 files changed, 21 insertions, 6 deletions
diff --git a/console.c b/console.c
index 785710a8b6..438a1d5fd3 100644
--- a/console.c
+++ b/console.c
@@ -1343,3 +1343,16 @@ void qemu_console_resize(QEMUConsole *console, int width, int height)
}
}
}
+
+void qemu_console_copy(QEMUConsole *console, int src_x, int src_y,
+ int dst_x, int dst_y, int w, int h) {
+ if (active_console == console) {
+ if (console->ds->dpy_copy)
+ console->ds->dpy_copy(console->ds,
+ src_x, src_y, dst_x, dst_y, w, h);
+ else {
+ /* TODO */
+ console->ds->dpy_update(console->ds, dst_x, dst_y, w, h);
+ }
+ }
+}
diff --git a/console.h b/console.h
index fcac1ebb8a..d98bea4481 100644
--- a/console.h
+++ b/console.h
@@ -140,6 +140,8 @@ CharDriverState *text_console_init(DisplayState *ds, const char *p);
void console_select(unsigned int index);
void console_color_init(DisplayState *ds);
void qemu_console_resize(QEMUConsole *console, int width, int height);
+void qemu_console_copy(QEMUConsole *console, int src_x, int src_y,
+ int dst_x, int dst_y, int w, int h);
/* sdl.c */
void sdl_display_init(DisplayState *ds, int full_screen, int no_frame);
diff --git a/hw/cirrus_vga.c b/hw/cirrus_vga.c
index 8e223e2662..53688a0eac 100644
--- a/hw/cirrus_vga.c
+++ b/hw/cirrus_vga.c
@@ -769,13 +769,13 @@ static void cirrus_do_copy(CirrusVGAState *s, int dst, int src, int w, int h)
s->cirrus_blt_width, s->cirrus_blt_height);
if (notify)
- s->ds->dpy_copy(s->ds,
- sx, sy, dx, dy,
- s->cirrus_blt_width / depth,
- s->cirrus_blt_height);
+ qemu_console_copy(s->console,
+ sx, sy, dx, dy,
+ s->cirrus_blt_width / depth,
+ s->cirrus_blt_height);
/* we don't have to notify the display that this portion has
- changed since dpy_copy implies this */
+ changed since qemu_console_copy implies this */
if (!notify)
cirrus_invalidate_region(s, s->cirrus_blt_dstaddr,
diff --git a/hw/vmware_vga.c b/hw/vmware_vga.c
index efbcd966a5..625cd83576 100644
--- a/hw/vmware_vga.c
+++ b/hw/vmware_vga.c
@@ -384,7 +384,7 @@ static inline void vmsvga_copy_rect(struct vmsvga_state_s *s,
# ifdef DIRECT_VRAM
if (s->ds->dpy_copy)
- s->ds->dpy_copy(s->ds, x0, y0, x1, y1, w, h);
+ qemu_console_copy(s->console, x0, y0, x1, y1, w, h);
else
# endif
{