[Spice-commits] Branch 'spice.v9' - 2 commits - hw/qxl-render.c vnc.c

[Gerd Hoffmann]

 hw/qxl-render.c |    4 ++--
 vnc.c           |    7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

New commits:
commit ee3f1f6232cb6022913deea8659409383d0584ad
Author: Gerd Hoffmann <kraxel at redhat.com>
Date:   Wed May 19 14:36:37 2010 +0200

    vnc: rich cursor tweaks

diff --git a/vnc.c b/vnc.c
index 3e5ebea..11ae3e5 100644
--- a/vnc.c
+++ b/vnc.c
@@ -49,6 +49,8 @@
 static VncDisplay *vnc_display; /* needed for info vnc */
 static DisplayChangeListener *dcl;
 
+static int vnc_cursor_define(VncState *vs);
+
 static char *addr_to_string(const char *format,
                             struct sockaddr_storage *sa,
                             socklen_t salen) {
@@ -549,6 +551,9 @@ static void vnc_dpy_resize(DisplayState *ds)
                 vnc_flush(vs);
             }
         }
+        if (vs->vd->cursor) {
+            vnc_cursor_define(vs);
+        }
         memset(vs->dirty, 0xFF, sizeof(vs->dirty));
     }
 }
@@ -1697,8 +1702,6 @@ static void set_encodings(VncState *vs, int32_t *encodings, size_t n_encodings)
         }
     }
     check_pointer_type_change(&vs->mouse_mode_notifier);
-    if (vs->vd->cursor)
-        vnc_cursor_define(vs);
 }
 
 static void set_pixel_conversion(VncState *vs)
commit 85432cbd9f8dd9b3fa14e9e2484cfb2695c96781
Author: Gerd Hoffmann <kraxel at redhat.com>
Date:   Wed May 19 14:36:14 2010 +0200

    qxl: raise cursor print debug level

diff --git a/hw/qxl-render.c b/hw/qxl-render.c
index 1dd5552..7536d39 100644
--- a/hw/qxl-render.c
+++ b/hw/qxl-render.c
@@ -139,14 +139,14 @@ static QEMUCursor *qxl_cursor(PCIQXLDevice *qxl, QXLCursor *cursor)
     case SPICE_CURSOR_TYPE_ALPHA:
         size = cursor->header.width * cursor->header.height * sizeof(uint32_t);
         memcpy(c->data, cursor->chunk.data, size);
-        if (qxl->debug)
+        if (qxl->debug > 1)
             cursor_print_ascii_art(c, "qxl/alpha");
         break;
     case SPICE_CURSOR_TYPE_MONO:
         mask  = cursor->chunk.data;
         image = mask + cursor_get_mono_bpl(c) * c->width;
         cursor_set_mono(c, 0xffffff, 0x000000, image, 1, mask);
-        if (qxl->debug)
+        if (qxl->debug > 1)
             cursor_print_ascii_art(c, "qxl/mono");
         break;
     default: