From patchwork Tue May 25 16:25:20 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 53558 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 4EBBCB7D18 for ; Wed, 26 May 2010 02:35:49 +1000 (EST) Received: from localhost ([127.0.0.1]:57461 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OGx6X-0006FY-Ku for incoming@patchwork.ozlabs.org; Tue, 25 May 2010 12:35:45 -0400 Received: from [140.186.70.92] (port=57749 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OGwwZ-0000tt-0v for qemu-devel@nongnu.org; Tue, 25 May 2010 12:25:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OGwwY-0005YD-0b for qemu-devel@nongnu.org; Tue, 25 May 2010 12:25:26 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52556) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OGwwX-0005Xw-N7 for qemu-devel@nongnu.org; Tue, 25 May 2010 12:25:25 -0400 Received: from int-mx05.intmail.prod.int.phx2.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.18]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o4PGPOuW006505 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 25 May 2010 12:25:25 -0400 Received: from zweiblum.home.kraxel.org (vpn2-8-178.ams2.redhat.com [10.36.8.178]) by int-mx05.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o4PGPNph018449; Tue, 25 May 2010 12:25:24 -0400 Received: by zweiblum.home.kraxel.org (Postfix, from userid 500) id 86AA670130; Tue, 25 May 2010 18:25:20 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Tue, 25 May 2010 18:25:20 +0200 Message-Id: <1274804720-518-6-git-send-email-kraxel@redhat.com> In-Reply-To: <1274804720-518-1-git-send-email-kraxel@redhat.com> References: <1274804720-518-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.18 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: Gerd Hoffmann Subject: [Qemu-devel] [PATCH 5/5] vnc: move size-changed check into the vnc_desktop_resize function. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This make sure we send a desktop resize message only in case we actually have to, using the new variables which track the clients desktop size. Signed-off-by: Gerd Hoffmann --- vnc.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/vnc.c b/vnc.c index 119ffe8..5715006 100644 --- a/vnc.c +++ b/vnc.c @@ -521,6 +521,10 @@ static void vnc_desktop_resize(VncState *vs) if (vs->csock == -1 || !vnc_has_feature(vs, VNC_FEATURE_RESIZE)) { return; } + if (vs->client_width == ds_get_width(ds) && + vs->client_height == ds_get_height(ds)) { + return; + } vs->client_width = ds_get_width(ds); vs->client_height = ds_get_height(ds); vnc_write_u8(vs, VNC_MSG_SERVER_FRAMEBUFFER_UPDATE); @@ -533,7 +537,6 @@ static void vnc_desktop_resize(VncState *vs) static void vnc_dpy_resize(DisplayState *ds) { - int size_changed; VncDisplay *vd = ds->opaque; VncState *vs; @@ -551,16 +554,12 @@ static void vnc_dpy_resize(DisplayState *ds) vd->guest.ds = qemu_mallocz(sizeof(*vd->guest.ds)); if (ds_get_bytes_per_pixel(ds) != vd->guest.ds->pf.bytes_per_pixel) console_color_init(ds); - size_changed = ds_get_width(ds) != vd->guest.ds->width || - ds_get_height(ds) != vd->guest.ds->height; *(vd->guest.ds) = *(ds->surface); memset(vd->guest.dirty, 0xFF, sizeof(vd->guest.dirty)); QTAILQ_FOREACH(vs, &vd->clients, next) { vnc_colordepth(vs); - if (size_changed) { - vnc_desktop_resize(vs); - } + vnc_desktop_resize(vs); if (vs->vd->cursor) { vnc_cursor_define(vs); }