| From 2f0eb4848baaa020132d5848a5d05e9db55fb15c Mon Sep 17 00:00:00 2001 |
| From: "Daniel P. Berrange" <berrange@redhat.com> |
| Date: Thu, 8 Feb 2018 17:50:24 +0100 |
| Subject: [PATCH 10/27] vnc: add vnc_width+vnc_height helpers |
| |
| RH-Author: Daniel P. Berrange <berrange@redhat.com> |
| Message-id: <20180208175041.5634-11-berrange@redhat.com> |
| Patchwork-id: 78943 |
| O-Subject: [RHEL-7.5 qemu-kvm PATCH v1 10/27] vnc: add vnc_width+vnc_height helpers |
| Bugzilla: 1527405 |
| RH-Acked-by: Laszlo Ersek <lersek@redhat.com> |
| RH-Acked-by: Gerd Hoffmann <kraxel@redhat.com> |
| RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com> |
| |
| From: Gerd Hoffmann <kraxel@redhat.com> |
| |
| Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> |
| Reviewed-by: Peter Lieven <pl@kamp.de> |
| Reviewed-by: Daniel P. Berrange <berrange@redhat.com> |
| Message-id: 1446203414-4013-12-git-send-email-kraxel@redhat.com |
| (cherry picked from commit d05959c2e111858bb83c40ae5d8b8c10964b7bb0) |
| Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com> |
| |
| ui/vnc.c | 16 +++++++++++++--- |
| 1 file changed, 13 insertions(+), 3 deletions(-) |
| |
| diff --git a/ui/vnc.c b/ui/vnc.c |
| index 9923d24..c3f29df 100644 |
| |
| |
| @@ -426,6 +426,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, |
| @@ -614,9 +625,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 |
| |