vnc: unbreak older gtk-vnc
v2 cover vnc: unbreak older gtk-vnc
Gerd Hoffmann (2):
Revert "vnc: move initialization to framebuffer_update_request"
vnc: send extended desktop resize on update requests
ui/vnc.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
Signature · 1 line
2.29.2
PATCH v2 1/2 Revert "vnc: move initialization to framebuffer_update_request"
This reverts commit 9e1632ad07ca49de99da4bb231e9e2f22f2d8df5.
Older gtk-vnc versions can't deal with non-incremental update requests sending pseudo-encodings, so trying to send full server state (including desktop size, cursor etc. which is done using pseudo-encodings) doesn't fly. Return to old behavior to send those only for new connects and when changes happen.
--- ui/vnc.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
ui/vnc.c +7 -4
@@ -687,6 +687,10 @@ static void vnc_desktop_resize(VncState *vs) !vnc_has_feature(vs, VNC_FEATURE_RESIZE_EXT))) {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 );
@@ -2042,10 +2046,6 @@ 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); } }
@@ -2189,7 +2189,10 @@ 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)
Signature · 1 line
2.29.2
PATCH v2 2/2 vnc: send extended desktop resize on update requests
In reply to Gerd HoffmannUnlike other pseudo-encodings these don't break gtk-vnc because older versions don't suport the extended desktop resize extension in the first place.
--- ui/vnc.c | 3 +++ 1 file changed, 3 insertions(+)
ui/vnc.c +3 -0
@@ -2046,6 +2046,9 @@ 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); +if (vnc_has_feature (vs,VNC_FEATURE_RESIZE_EXT )) { +vnc_desktop_resize_ext (vs,0 ); + } } }
Signature · 1 line
2.29.2
Quoted 9 lines · Gerd Hoffmann
Gerd Hoffmann (2):
Revert "vnc: move initialization toframebuffer_update_request"
vnc: send extended desktop resize on update requestsui/vnc.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
I didn't test desktop resize, but I can confirm the regression is gone.
Thanks!
Laszlo