From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36237) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zs7Zk-0005fs-CS for qemu-devel@nongnu.org; Fri, 30 Oct 2015 07:10:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zs7Ze-0002ZF-Lb for qemu-devel@nongnu.org; Fri, 30 Oct 2015 07:10:28 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35489) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zs7Ze-0002Yx-Ge for qemu-devel@nongnu.org; Fri, 30 Oct 2015 07:10:22 -0400 From: Gerd Hoffmann Date: Fri, 30 Oct 2015 12:10:07 +0100 Message-Id: <1446203414-4013-13-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 12/19] vnc: factor out vnc_update_server_surface 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 | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/ui/vnc.c b/ui/vnc.c index 283b93c..61a8f2c 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -714,6 +714,17 @@ void *vnc_server_fb_ptr(VncDisplay *vd, int x, int y) return ptr; } +static void vnc_update_server_surface(VncDisplay *vd) +{ + qemu_pixman_image_unref(vd->server); + vd->server = NULL; + + vd->server = pixman_image_create_bits(VNC_SERVER_FB_FORMAT, + vnc_width(vd), + vnc_height(vd), + NULL, 0); +} + static void vnc_dpy_switch(DisplayChangeListener *dcl, DisplaySurface *surface) { @@ -722,19 +733,17 @@ static void vnc_dpy_switch(DisplayChangeListener *dcl, int width, height; vnc_abort_display_jobs(vd); - - /* server surface */ - qemu_pixman_image_unref(vd->server); vd->ds = surface; - width = vnc_width(vd); - height = vnc_height(vd); - vd->server = pixman_image_create_bits(VNC_SERVER_FB_FORMAT, - width, height, NULL, 0); + + /* server surface */ + vnc_update_server_surface(vd); /* guest surface */ qemu_pixman_image_unref(vd->guest.fb); vd->guest.fb = pixman_image_ref(surface->image); vd->guest.format = surface->format; + width = vnc_width(vd); + height = vnc_height(vd); memset(vd->guest.dirty, 0x00, sizeof(vd->guest.dirty)); vnc_set_area_dirty(vd->guest.dirty, width, height, 0, 0, width, height); -- 1.8.3.1