From: Gerd Hoffmann Date: Fri, 30 Oct 2015 11:10:06 +0000 (+0100) Subject: vnc: add vnc_width+vnc_height helpers X-Git-Tag: v2.5.0-rc1~11^2~9 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=d05959c2e111858bb83c40ae5d8b8c10964b7bb0;p=qemu-xen-unstable.git vnc: add vnc_width+vnc_height helpers Signed-off-by: Gerd Hoffmann Reviewed-by: Peter Lieven Reviewed-by: Daniel P. Berrange Message-id: 1446203414-4013-12-git-send-email-kraxel@redhat.com --- diff --git a/ui/vnc.c b/ui/vnc.c index 49de39d0d6..9ffad16056 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -615,6 +615,17 @@ static void framebuffer_update_request(VncState *vs, int incremental, static void vnc_refresh(DisplayChangeListener *dcl); static int vnc_refresh_server_surface(VncDisplay *vd); +static int vnc_width(VncDisplay *vd) +{ + return MIN(VNC_MAX_WIDTH, ROUND_UP(surface_width(vd->ds), + VNC_DIRTY_PIXELS_PER_BIT)); +} + +static int vnc_height(VncDisplay *vd) +{ + return MIN(VNC_MAX_HEIGHT, surface_height(vd->ds)); +} + static void vnc_set_area_dirty(DECLARE_BITMAP(dirty[VNC_MAX_HEIGHT], VNC_MAX_WIDTH / VNC_DIRTY_PIXELS_PER_BIT), int width, int height, @@ -725,9 +736,8 @@ static void vnc_dpy_switch(DisplayChangeListener *dcl, /* server surface */ qemu_pixman_image_unref(vd->server); vd->ds = surface; - width = MIN(VNC_MAX_WIDTH, ROUND_UP(surface_width(vd->ds), - VNC_DIRTY_PIXELS_PER_BIT)); - height = MIN(VNC_MAX_HEIGHT, surface_height(vd->ds)); + width = vnc_width(vd); + height = vnc_height(vd); vd->server = pixman_image_create_bits(VNC_SERVER_FB_FORMAT, width, height, NULL, 0);