[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 2/3] vnc: move initialization to framebuffer_update_request
From: |
Gerd Hoffmann |
Subject: |
[PATCH v3 2/3] vnc: move initialization to framebuffer_update_request |
Date: |
Tue, 12 Jan 2021 14:41:19 +0100 |
qemu sends various state info like current cursor shape to newly connected
clients in response to a set_encoding message. This is not correct according
to the rfb spec. Send that information in response to a full (incremental=0)
framebuffer update request instead. Also send the resize information
unconditionally, not only in case of an actual server-side change.
This makes the qemu vnc server conform to the spec and allows clients to
request the complete vnc server state without reconnect.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
ui/vnc.c | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/ui/vnc.c b/ui/vnc.c
index 84c4972b895b..8df63b349b38 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -660,10 +660,6 @@ static void vnc_desktop_resize(VncState *vs)
if (vs->ioc == NULL || !vnc_has_feature(vs, VNC_FEATURE_RESIZE)) {
return;
}
- if (vs->client_width == pixman_image_get_width(vs->vd->server) &&
- vs->client_height == pixman_image_get_height(vs->vd->server)) {
- return;
- }
assert(pixman_image_get_width(vs->vd->server) < 65536 &&
pixman_image_get_width(vs->vd->server) >= 0);
@@ -2013,6 +2009,10 @@ static void framebuffer_update_request(VncState *vs, int
incremental,
} else {
vs->update = VNC_STATE_UPDATE_FORCE;
vnc_set_area_dirty(vs->dirty, vs->vd, x, y, w, h);
+ vnc_colordepth(vs);
+ vnc_desktop_resize(vs);
+ vnc_led_state_change(vs);
+ vnc_cursor_define(vs);
}
}
@@ -2136,10 +2136,7 @@ static void set_encodings(VncState *vs, int32_t
*encodings, size_t n_encodings)
break;
}
}
- vnc_desktop_resize(vs);
check_pointer_type_change(&vs->mouse_mode_notifier, NULL);
- vnc_led_state_change(vs);
- vnc_cursor_define(vs);
}
static void set_pixel_conversion(VncState *vs)
--
2.29.2