From patchwork Wed Aug 11 05:49:43 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corentin Chary X-Patchwork-Id: 61451 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 3C700B70AA for ; Wed, 11 Aug 2010 16:17:40 +1000 (EST) Received: from localhost ([127.0.0.1]:36281 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Oj4cy-0000ma-CP for incoming@patchwork.ozlabs.org; Wed, 11 Aug 2010 02:17:28 -0400 Received: from [140.186.70.92] (port=38019 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Oj4DS-000694-8y for qemu-devel@nongnu.org; Wed, 11 Aug 2010 01:51:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Oj4DR-0007Wp-6K for qemu-devel@nongnu.org; Wed, 11 Aug 2010 01:51:06 -0400 Received: from relay1-v.mail.gandi.net ([217.70.178.75]:32851 helo=mrelay1-v.mgt.gandi.net) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Oj4DQ-0007Wh-TN for qemu-devel@nongnu.org; Wed, 11 Aug 2010 01:51:05 -0400 X-Originating-IP: 217.70.178.44 Received: from mfilter3-d.gandi.net (mfilter3-d.gandi.net [217.70.178.44]) by mrelay1-v.mgt.gandi.net (Postfix) with ESMTP id 77185362BA; Wed, 11 Aug 2010 07:51:04 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mfilter3-d.gandi.net Received: from mrelay1-v.mgt.gandi.net ([217.70.178.75]) by mfilter3-d.gandi.net (mfilter3-d.gandi.net [217.70.178.44]) (amavisd-new, port 10024) with ESMTP id 9OX3HvyZFGNl; Wed, 11 Aug 2010 07:51:02 +0200 (CEST) X-Originating-IP: 82.241.209.44 Received: from tartiflon (falgoret.iksaif.net [82.241.209.44]) (Authenticated sender: fake@iksaif.net) by mrelay1-v.mgt.gandi.net (Postfix) with ESMTPSA id 15C48362B5; Wed, 11 Aug 2010 07:50:54 +0200 (CEST) From: Corentin Chary To: Qemu-development List Date: Wed, 11 Aug 2010 07:49:43 +0200 Message-Id: <1281505785-22523-14-git-send-email-corentincj@iksaif.net> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1281505785-22523-1-git-send-email-corentincj@iksaif.net> References: <1281505785-22523-1-git-send-email-corentincj@iksaif.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) Cc: Corentin Chary , Anthony Liguori , Alexander Graf , Andre Przywara Subject: [Qemu-devel] [PATCH 13/15] vnc: don't try to send bigger updates that client height 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 Respect client size if it doesn't not support desktop resizing. Signed-off-by: Corentin Chary --- ui/vnc.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ui/vnc.c b/ui/vnc.c index 0adab4a..dffb4aa 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -791,12 +791,11 @@ static void vnc_dpy_cursor_define(QEMUCursor *c) } static int find_and_clear_dirty_height(struct VncState *vs, - int y, int last_x, int x) + int y, int last_x, int x, int height) { int h; - VncDisplay *vd = vs->vd; - for (h = 1; h < (vd->server->height - y); h++) { + for (h = 1; h < (height - y); h++) { int tmp_x; if (!test_bit(last_x, vs->dirty[y + h])) { break; @@ -861,7 +860,8 @@ static int vnc_update_client(VncState *vs, int has_dirty) } } else { if (last_x != -1) { - int h = find_and_clear_dirty_height(vs, y, last_x, x); + int h = find_and_clear_dirty_height(vs, y, last_x, x, + height); n += vnc_job_add_rect(job, last_x * 16, y, (x - last_x) * 16, h); @@ -870,7 +870,7 @@ static int vnc_update_client(VncState *vs, int has_dirty) } } if (last_x != -1) { - int h = find_and_clear_dirty_height(vs, y, last_x, x); + int h = find_and_clear_dirty_height(vs, y, last_x, x, height); n += vnc_job_add_rect(job, last_x * 16, y, (x - last_x) * 16, h); }