From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36247) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zs7Zl-0005h6-Iw for qemu-devel@nongnu.org; Fri, 30 Oct 2015 07:10:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zs7Ze-0002Z9-J9 for qemu-devel@nongnu.org; Fri, 30 Oct 2015 07:10:29 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53421) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zs7Ze-0002Yq-EH for qemu-devel@nongnu.org; Fri, 30 Oct 2015 07:10:22 -0400 From: Gerd Hoffmann Date: Fri, 30 Oct 2015 12:10:06 +0100 Message-Id: <1446203414-4013-12-git-send-email-kraxel@redhat.com> In-Reply-To: <1446203414-4013-1-git-send-email-kraxel@redhat.com> References: <1446203414-4013-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 11/19] vnc: add vnc_width+vnc_height helpers List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: pl@kamp.de, Gerd Hoffmann Signed-off-by: Gerd Hoffmann --- ui/vnc.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/ui/vnc.c b/ui/vnc.c index cb1954c..283b93c 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -605,6 +605,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, @@ -715,9 +726,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); -- 1.8.3.1