[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 1/3] Revert "vnc: move initialization to framebuffer_update_reques
From: |
Gerd Hoffmann |
Subject: |
[PULL 1/3] Revert "vnc: move initialization to framebuffer_update_request" |
Date: |
Wed, 27 Jan 2021 12:01:10 +0100 |
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.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Tested-by: Laszlo Ersek <lersek@redhat.com>
Message-Id: <20210125104041.495274-2-kraxel@redhat.com>
---
ui/vnc.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/ui/vnc.c b/ui/vnc.c
index 66f7c1b9361e..2622f82a5a9f 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -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)
--
2.29.2