From 07535a890200e640517be0ae04fcff28860ecd37 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Wed, 23 Jul 2014 16:03:14 +0200 Subject: [PATCH 1/2] fix full frame updates for VNC clients If the client asks for !incremental frame updates, it has lost its content so dirty doesn't matter - it has to see the full frame, so setting force_update Signed-off-by: Stephan Kulow Signed-off-by: Gerd Hoffmann Reviewed-by: Peter Lieven --- ui/vnc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/ui/vnc.c b/ui/vnc.c index 548588aab8..06d6ca009e 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -1878,6 +1878,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); } From 6365828003c8e88bff67d351af4b66c406568a26 Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Wed, 23 Jul 2014 11:52:02 +0200 Subject: [PATCH 2/2] vnc update fix We need to remember has_updates for each vnc client. Otherwise it might happen that vnc_update_client(has_dirty=1) takes the first exit due to output buffers not being flushed yet and subsequent calls with has_dirty=0 take the second exit, wrongly assuming there is nothing to do because the work defered in the first call is ignored. Signed-off-by: Gerd Hoffmann Reviewed-by: Peter Lieven --- ui/vnc.c | 4 +++- ui/vnc.h | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ui/vnc.c b/ui/vnc.c index 06d6ca009e..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; } 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;