From 9f4c601032d7a27e8856517a1a020c9988667ed3 Mon Sep 17 00:00:00 2001

From: Gerd Hoffmann <kraxel@redhat.com>

Date: Wed, 5 Sep 2012 09:35:57 +0200

Subject: [PATCH] spice: add screen mirror

Create a screen mirror, keep there a copy of the most recent update

passed on to spice-server.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>

---

 ui/spice-display.c | 32 ++++++++++++++++++++++----------

 ui/spice-display.h |  1 +

 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/ui/spice-display.c b/ui/spice-display.c

index 6f68f28..973cd53 100644

--- a/ui/spice-display.c

+++ b/ui/spice-display.c

@@ -171,8 +171,8 @@ static void qemu_spice_create_one_update(SimpleSpiceDisplay *ssd,

     QXLDrawable *drawable;

     QXLImage *image;

     QXLCommand *cmd;

-    uint8_t *src, *dst;

-    int by, bw, bh;

+    uint8_t *src, *mirror, *dst;

+    int by, bw, bh, offset, bytes;

     struct timespec time_space;

     trace_qemu_spice_create_update(

@@ -216,19 +216,18 @@ static void qemu_spice_create_one_update(SimpleSpiceDisplay *ssd,

     image->bitmap.palette = 0;

     image->bitmap.format = SPICE_BITMAP_FMT_32BIT;

-    if (ssd->conv == NULL) {

-        PixelFormat dst = qemu_default_pixelformat(32);

-        ssd->conv = qemu_pf_conv_get(&dst, &ssd->ds->surface->pf);

-        assert(ssd->conv);

-    }

-

-    src = ds_get_data(ssd->ds) +

+    offset =

         rect->top * ds_get_linesize(ssd->ds) +

         rect->left * ds_get_bytes_per_pixel(ssd->ds);

+    bytes = ds_get_bytes_per_pixel(ssd->ds) * bw;

+    src = ds_get_data(ssd->ds) + offset;

+    mirror = ssd->ds_mirror + offset;

     dst = update->bitmap;

     for (by = 0; by < bh; by++) {

-        qemu_pf_conv_run(ssd->conv, dst, src, bw);

+        memcpy(mirror, src, bytes);

+        qemu_pf_conv_run(ssd->conv, dst, mirror, bw);

         src += ds_get_linesize(ssd->ds);

+        mirror += ds_get_linesize(ssd->ds);

         dst += image->bitmap.stride;

     }

@@ -243,6 +242,17 @@ static void qemu_spice_create_update(SimpleSpiceDisplay *ssd)

     if (qemu_spice_rect_is_empty(&ssd->dirty)) {

         return;

     };

+

+    if (ssd->conv == NULL) {

+        PixelFormat dst = qemu_default_pixelformat(32);

+        ssd->conv = qemu_pf_conv_get(&dst, &ssd->ds->surface->pf);

+        assert(ssd->conv);

+    }

+    if (ssd->ds_mirror == NULL) {

+        int size = ds_get_height(ssd->ds) * ds_get_linesize(ssd->ds);

+        ssd->ds_mirror = g_malloc0(size);

+    }

+

     qemu_spice_create_one_update(ssd, &ssd->dirty);

     memset(&ssd->dirty, 0, sizeof(ssd->dirty));

 }

@@ -358,6 +368,8 @@ void qemu_spice_display_resize(SimpleSpiceDisplay *ssd)

     memset(&ssd->dirty, 0, sizeof(ssd->dirty));

     qemu_pf_conv_put(ssd->conv);

     ssd->conv = NULL;

+    g_free(ssd->ds_mirror);

+    ssd->ds_mirror = NULL;

     qemu_mutex_lock(&ssd->lock);

     while ((update = QTAILQ_FIRST(&ssd->updates)) != NULL) {

diff --git a/ui/spice-display.h b/ui/spice-display.h

index 3fcb6fe..dea41c1 100644

--- a/ui/spice-display.h

+++ b/ui/spice-display.h

@@ -72,6 +72,7 @@ typedef struct SimpleSpiceUpdate SimpleSpiceUpdate;

 struct SimpleSpiceDisplay {

     DisplayState *ds;

+    uint8_t *ds_mirror;

     void *buf;

     int bufsize;

     QXLWorker *worker;

-- 

1.7.12.1