summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Maydell2021-01-28 11:47:00 +0100
committerPeter Maydell2021-01-28 11:47:01 +0100
commit091f255b89e818b84cd003c1da552b6dc3fe3cbd (patch)
tree5e4bb59851bf93aa36a18e9b70f2798291d4e0b9
parentMerge remote-tracking branch 'remotes/huth-gitlab/tags/pull-request-2021-01-2... (diff)
parenthw/display/vmware_vga: Remove dependency on VNC header (diff)
downloadqemu-091f255b89e818b84cd003c1da552b6dc3fe3cbd.tar.gz
qemu-091f255b89e818b84cd003c1da552b6dc3fe3cbd.tar.xz
qemu-091f255b89e818b84cd003c1da552b6dc3fe3cbd.zip
Merge remote-tracking branch 'remotes/kraxel/tags/ui-20210127-pull-request' into staging
vnc: fix gtk-vnc compatibility issues. vnc: vmware svga cleanup # gpg: Signature made Wed 27 Jan 2021 11:00:59 GMT # gpg: using RSA key A0328CFFB93A17A79901FE7D4CB6D8EED3E87138 # gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" [full] # gpg: aka "Gerd Hoffmann <gerd@kraxel.org>" [full] # gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>" [full] # Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138 * remotes/kraxel/tags/ui-20210127-pull-request: hw/display/vmware_vga: Remove dependency on VNC header vnc: send extended desktop resize on update requests Revert "vnc: move initialization to framebuffer_update_request" Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-rw-r--r--hw/display/vmware_vga.c3
-rw-r--r--ui/vnc.c14
2 files changed, 11 insertions, 6 deletions
diff --git a/hw/display/vmware_vga.c b/hw/display/vmware_vga.c
index bef0d7d69a..e2969a6c81 100644
--- a/hw/display/vmware_vga.c
+++ b/hw/display/vmware_vga.c
@@ -29,7 +29,6 @@
#include "qemu/log.h"
#include "hw/loader.h"
#include "trace.h"
-#include "ui/vnc.h"
#include "hw/pci/pci.h"
#include "hw/qdev-properties.h"
#include "migration/vmstate.h"
@@ -220,7 +219,7 @@ enum {
/* These values can probably be changed arbitrarily. */
#define SVGA_SCRATCH_SIZE 0x8000
-#define SVGA_MAX_WIDTH ROUND_UP(2360, VNC_DIRTY_PIXELS_PER_BIT)
+#define SVGA_MAX_WIDTH 2368
#define SVGA_MAX_HEIGHT 1770
#ifdef VERBOSE
diff --git a/ui/vnc.c b/ui/vnc.c
index 66f7c1b936..16bb3be770 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,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);
- vnc_colordepth(vs);
- vnc_desktop_resize(vs);
- vnc_led_state_change(vs);
- vnc_cursor_define(vs);
+ if (vnc_has_feature(vs, VNC_FEATURE_RESIZE_EXT)) {
+ vnc_desktop_resize_ext(vs, 0);
+ }
}
}
@@ -2189,7 +2192,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)