diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-07-25 10:32:13 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-07-25 10:32:13 +0100 |
| commit | 7f0b2ff7248f7621b375f108e54eed5690769c47 (patch) | |
| tree | 348959cc0eb2ee3e1ccb152be494ef2495047e28 | |
| parent | 3b257486639cf6c25e1f3a744d1f19e6b4efdc7a (diff) | |
| parent | 6365828003c8e88bff67d351af4b66c406568a26 (diff) | |
| download | focaccia-qemu-7f0b2ff7248f7621b375f108e54eed5690769c47.tar.gz focaccia-qemu-7f0b2ff7248f7621b375f108e54eed5690769c47.zip | |
Merge remote-tracking branch 'remotes/kraxel/tags/pull-vnc-20140725-1' into staging
vnc: fix two vnc update issues. # gpg: Signature made Fri 25 Jul 2014 08:44:23 BST using RSA key ID D3E87138 # gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" # gpg: aka "Gerd Hoffmann <gerd@kraxel.org>" # gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>" * remotes/kraxel/tags/pull-vnc-20140725-1: vnc update fix fix full frame updates for VNC clients Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | ui/vnc.c | 5 | ||||
| -rw-r--r-- | ui/vnc.h | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/ui/vnc.c b/ui/vnc.c index 548588aab8..f8d9b7db95 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -887,6 +887,7 @@ static int find_and_clear_dirty_height(struct VncState *vs, static int vnc_update_client(VncState *vs, int has_dirty, bool sync) { + vs->has_dirty += has_dirty; if (vs->need_update && vs->csock != -1) { VncDisplay *vd = vs->vd; VncJob *job; @@ -898,7 +899,7 @@ static int vnc_update_client(VncState *vs, int has_dirty, bool sync) /* kernel send buffers are full -> drop frames to throttle */ return 0; - if (!has_dirty && !vs->audio_cap && !vs->force_update) + if (!vs->has_dirty && !vs->audio_cap && !vs->force_update) return 0; /* @@ -941,6 +942,7 @@ static int vnc_update_client(VncState *vs, int has_dirty, bool sync) vnc_jobs_join(vs); } vs->force_update = 0; + vs->has_dirty = 0; return n; } @@ -1878,6 +1880,7 @@ static void framebuffer_update_request(VncState *vs, int incremental, return; } + vs->force_update = 1; vnc_set_area_dirty(vs->dirty, width, height, x, y, w, h); } diff --git a/ui/vnc.h b/ui/vnc.h index 8f582fdc6c..334de9ddb1 100644 --- a/ui/vnc.h +++ b/ui/vnc.h @@ -263,6 +263,7 @@ struct VncState VncDisplay *vd; int need_update; int force_update; + int has_dirty; uint32_t features; int absolute; int last_x; |