From patchwork Tue May 25 16:25:18 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 53561 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 BC214B7D12 for ; Wed, 26 May 2010 02:44:17 +1000 (EST) Received: from localhost ([127.0.0.1]:45699 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OGxEl-0004UT-22 for incoming@patchwork.ozlabs.org; Tue, 25 May 2010 12:44:15 -0400 Received: from [140.186.70.92] (port=57723 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OGwwX-0000sx-OL for qemu-devel@nongnu.org; Tue, 25 May 2010 12:25:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OGwwW-0005XV-2t for qemu-devel@nongnu.org; Tue, 25 May 2010 12:25:25 -0400 Received: from mx1.redhat.com ([209.132.183.28]:2107) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OGwwV-0005XC-S0 for qemu-devel@nongnu.org; Tue, 25 May 2010 12:25:24 -0400 Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o4PGPMZU006501 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 25 May 2010 12:25:23 -0400 Received: from zweiblum.home.kraxel.org (vpn2-8-178.ams2.redhat.com [10.36.8.178]) by int-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o4PGPLKP020308; Tue, 25 May 2010 12:25:21 -0400 Received: by zweiblum.home.kraxel.org (Postfix, from userid 500) id 788927012E; Tue, 25 May 2010 18:25:20 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Tue, 25 May 2010 18:25:18 +0200 Message-Id: <1274804720-518-4-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.16 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: Gerd Hoffmann Subject: [Qemu-devel] [PATCH 3/5] vnc: keep track of client desktop size 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 Add two new variables to keep track of the vnc clients desktop size. Signed-off-by: Gerd Hoffmann --- vnc.c | 10 +++++++--- vnc.h | 2 ++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/vnc.c b/vnc.c index 0e0e566..30e0bed 100644 --- a/vnc.c +++ b/vnc.c @@ -521,10 +521,12 @@ static void vnc_desktop_resize(VncState *vs) if (vs->csock == -1 || !vnc_has_feature(vs, VNC_FEATURE_RESIZE)) { return; } + vs->client_width = ds_get_width(ds); + vs->client_height = ds_get_height(ds); vnc_write_u8(vs, VNC_MSG_SERVER_FRAMEBUFFER_UPDATE); vnc_write_u8(vs, 0); vnc_write_u16(vs, 1); /* number of rects */ - vnc_framebuffer_update(vs, 0, 0, ds_get_width(ds), ds_get_height(ds), + vnc_framebuffer_update(vs, 0, 0, vs->client_width, vs->client_height, VNC_ENCODING_DESKTOPRESIZE); vnc_flush(vs); } @@ -1958,8 +1960,10 @@ static int protocol_client_init(VncState *vs, uint8_t *data, size_t len) char buf[1024]; int size; - vnc_write_u16(vs, ds_get_width(vs->ds)); - vnc_write_u16(vs, ds_get_height(vs->ds)); + vs->client_width = ds_get_width(vs->ds); + vs->client_height = ds_get_height(vs->ds); + vnc_write_u16(vs, vs->client_width); + vnc_write_u16(vs, vs->client_height); pixel_format_message(vs); diff --git a/vnc.h b/vnc.h index 0d39897..d648832 100644 --- a/vnc.h +++ b/vnc.h @@ -134,6 +134,8 @@ struct VncState int absolute; int last_x; int last_y; + int client_width; + int client_height; uint32_t vnc_encoding;