From patchwork Thu Nov 11 16:56:59 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corentin Chary X-Patchwork-Id: 70832 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 0FCBFB7146 for ; Fri, 12 Nov 2010 04:03:40 +1100 (EST) Received: from localhost ([127.0.0.1]:45891 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PGaYj-0002Kc-Bp for incoming@patchwork.ozlabs.org; Thu, 11 Nov 2010 12:03:37 -0500 Received: from [140.186.70.92] (port=52226 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PGaSe-0000Ak-Qn for qemu-devel@nongnu.org; Thu, 11 Nov 2010 11:57:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PGaSc-0005cR-QL for qemu-devel@nongnu.org; Thu, 11 Nov 2010 11:57:20 -0500 Received: from relay2-v.mail.gandi.net ([217.70.178.76]:54309) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PGaSc-0005cA-IN for qemu-devel@nongnu.org; Thu, 11 Nov 2010 11:57:18 -0500 X-Originating-IP: 217.70.178.37 Received: from mfilter3-v.gandi.net (mfilter3-v.gandi.net [217.70.178.37]) by relay2-v.mail.gandi.net (Postfix) with ESMTP id EC876135E2; Thu, 11 Nov 2010 17:57:17 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at mfilter3-v.gandi.net Received: from relay2-v.mail.gandi.net ([217.70.178.76]) by mfilter3-v.gandi.net (mfilter3-v.gandi.net [217.70.178.37]) (amavisd-new, port 10024) with ESMTP id Q2PN+BxPMOwr; Thu, 11 Nov 2010 17:57:17 +0100 (CET) X-Originating-IP: 82.241.209.44 Received: from localhost.localdomain (falgoret.iksaif.net [82.241.209.44]) (Authenticated sender: fake@iksaif.net) by relay2-v.mail.gandi.net (Postfix) with ESMTPSA id 41A6D135E1; Thu, 11 Nov 2010 17:57:14 +0100 (CET) From: Corentin Chary To: Qemu-development List Date: Thu, 11 Nov 2010 17:56:59 +0100 Message-Id: <1289494624-12807-11-git-send-email-corentincj@iksaif.net> X-Mailer: git-send-email 1.7.3.2 In-Reply-To: <1289494624-12807-1-git-send-email-corentincj@iksaif.net> References: <1289494624-12807-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 v2 10/15] vnc: fix lossy rect refreshing 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 The for loop in send_lossy_rect was totally wrong, and we can't call vnc_set_bits() because it does not really do what it should. Use vnc_set_bit() directly instead. Signed-off-by: Corentin Chary --- ui/vnc.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ui/vnc.c b/ui/vnc.c index 227efb6..fc2be61 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -2296,8 +2296,8 @@ void vnc_sent_lossy_rect(VncState *vs, int x, int y, int w, int h) x /= VNC_STAT_RECT; y /= VNC_STAT_RECT; - for (j = y; j <= y + h; j++) { - for (i = x; i <= x + w; i++) { + for (j = y; j <= h; j++) { + for (i = x; i <= w; i++) { vs->lossy_rect[j][i] = 1; } } @@ -2314,7 +2314,7 @@ static int vnc_refresh_lossy_rect(VncDisplay *vd, int x, int y) x = x / VNC_STAT_RECT * VNC_STAT_RECT; QTAILQ_FOREACH(vs, &vd->clients, next) { - int j ; + int j, i; /* kernel send buffers are full -> refresh later */ if (vs->output.offset) @@ -2322,12 +2322,16 @@ static int vnc_refresh_lossy_rect(VncDisplay *vd, int x, int y) if (!vs->lossy_rect[sty][stx]) continue ; + vs->lossy_rect[sty][stx] = 0; for (j = 0; j < VNC_STAT_RECT; ++j) { - vnc_set_bits(vs->dirty[y + j], x / 16, VNC_STAT_RECT / 16); + for (i = x / 16; i < VNC_STAT_RECT / 16 + x / 16; ++i) { + vnc_set_bit(vs->dirty[y + j], i); + } } has_dirty++; } + return has_dirty; }