Patchwork [13/15] vnc: don't try to send bigger updates that client height

login
register
mail settings
Submitter Corentin Chary
Date Aug. 11, 2010, 5:49 a.m.
Message ID <1281505785-22523-14-git-send-email-corentincj@iksaif.net>
Download mbox | patch
Permalink /patch/61451/
State New
Headers show

Comments

Corentin Chary - Aug. 11, 2010, 5:49 a.m.
Respect client size if it doesn't not support desktop resizing.

Signed-off-by: Corentin Chary <corentincj@iksaif.net>
---
 ui/vnc.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

Patch

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);
             }