From patchwork Fri Feb 4 08:06:06 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corentin Chary X-Patchwork-Id: 81831 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 82E81B70FF for ; Fri, 4 Feb 2011 20:01:51 +1100 (EST) Received: from localhost ([127.0.0.1]:43732 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PlH3Y-0005BM-II for incoming@patchwork.ozlabs.org; Fri, 04 Feb 2011 03:30:16 -0500 Received: from [140.186.70.92] (port=49593 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PlGfe-00040i-1P for qemu-devel@nongnu.org; Fri, 04 Feb 2011 03:05:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PlGfc-0001pW-Rj for qemu-devel@nongnu.org; Fri, 04 Feb 2011 03:05:33 -0500 Received: from smtp5-g21.free.fr ([212.27.42.5]:52715) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PlGfc-0001pF-5I for qemu-devel@nongnu.org; Fri, 04 Feb 2011 03:05:32 -0500 Received: from localhost.localdomain (unknown [82.241.209.44]) by smtp5-g21.free.fr (Postfix) with ESMTP id AA54CD48205; Fri, 4 Feb 2011 09:05:26 +0100 (CET) From: Corentin Chary To: Anthony Liguori Date: Fri, 4 Feb 2011 09:06:06 +0100 Message-Id: <1296806768-27787-15-git-send-email-corentincj@iksaif.net> X-Mailer: git-send-email 1.7.4 In-Reply-To: <1296806768-27787-1-git-send-email-corentincj@iksaif.net> References: <1296806768-27787-1-git-send-email-corentincj@iksaif.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 212.27.42.5 Cc: Corentin Chary , Andre Przywara , Qemu-development List , Alexander Graf Subject: [Qemu-devel] [PATCH v3 14/16] 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 6c57b0e..86c23207 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -795,12 +795,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; @@ -865,7 +864,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); @@ -874,7 +874,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); }