diff options
| author | Corentin Chary <corentincj@iksaif.net> | 2011-02-04 09:06:06 +0100 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-02-23 16:28:29 -0600 |
| commit | 6c71a539c3cb3927fdea230c3ddb9e273142570f (patch) | |
| tree | aca6b035589e343c696721e234784bda2f9a9ec1 /ui/vnc.c | |
| parent | bc2429b9174ac2d3c56b7fd35884b0d89ec7fb02 (diff) | |
| download | focaccia-qemu-6c71a539c3cb3927fdea230c3ddb9e273142570f.tar.gz focaccia-qemu-6c71a539c3cb3927fdea230c3ddb9e273142570f.zip | |
vnc: don't try to send bigger updates that client height
Respect client size if it doesn't not support desktop resizing. Signed-off-by: Corentin Chary <corentincj@iksaif.net> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'ui/vnc.c')
| -rw-r--r-- | ui/vnc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ui/vnc.c b/ui/vnc.c index 6c57b0eab7..86c232079a 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); } |