Patchwork [v3,11/16] vnc: fix lossy rect refreshing

login
register
mail settings
Submitter Corentin Chary
Date Feb. 4, 2011, 8:06 a.m.
Message ID <1296806768-27787-12-git-send-email-corentincj@iksaif.net>
Download mbox | patch
Permalink /patch/81822/
State New
Headers show

Comments

Corentin Chary - Feb. 4, 2011, 8:06 a.m.
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 <corentincj@iksaif.net>
---
 ui/vnc.c |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

Patch

diff --git a/ui/vnc.c b/ui/vnc.c
index 9920c0e..8c7cb0d 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -2297,8 +2297,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;
         }
     }
@@ -2315,7 +2315,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) {
@@ -2325,12 +2325,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;
 }