[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 09/11] vnc: move check into vnc_cursor_define
From: |
Gerd Hoffmann |
Subject: |
[PULL 09/11] vnc: move check into vnc_cursor_define |
Date: |
Fri, 15 Jan 2021 11:24:22 +0100 |
Move the check whenever a cursor exists into the vnc_cursor_define()
function so callers don't have to do it.
Suggested-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-id: 20210112134120.2031837-2-kraxel@redhat.com
---
ui/vnc.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/ui/vnc.c b/ui/vnc.c
index d4854d351bac..0f01481cac57 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -793,9 +793,7 @@ static void vnc_dpy_switch(DisplayChangeListener *dcl,
QTAILQ_FOREACH(vs, &vd->clients, next) {
vnc_colordepth(vs);
vnc_desktop_resize(vs);
- if (vs->vd->cursor) {
- vnc_cursor_define(vs);
- }
+ vnc_cursor_define(vs);
memset(vs->dirty, 0x00, sizeof(vs->dirty));
vnc_set_area_dirty(vs->dirty, vd, 0, 0,
vnc_width(vd),
@@ -929,6 +927,10 @@ static int vnc_cursor_define(VncState *vs)
QEMUCursor *c = vs->vd->cursor;
int isize;
+ if (!vs->vd->cursor) {
+ return -1;
+ }
+
if (vnc_has_feature(vs, VNC_FEATURE_ALPHA_CURSOR)) {
vnc_lock_output(vs);
vnc_write_u8(vs, VNC_MSG_SERVER_FRAMEBUFFER_UPDATE);
@@ -2155,9 +2157,7 @@ static void set_encodings(VncState *vs, int32_t
*encodings, size_t n_encodings)
vnc_desktop_resize(vs);
check_pointer_type_change(&vs->mouse_mode_notifier, NULL);
vnc_led_state_change(vs);
- if (vs->vd->cursor) {
- vnc_cursor_define(vs);
- }
+ vnc_cursor_define(vs);
}
static void set_pixel_conversion(VncState *vs)
--
2.29.2
- [PULL 02/11] ui/gtk: rename variable window to widget, (continued)
- [PULL 02/11] ui/gtk: rename variable window to widget, Gerd Hoffmann, 2021/01/15
- [PULL 01/11] ui/gtk: don't try to redefine SI prefixes, Gerd Hoffmann, 2021/01/15
- [PULL 03/11] ui/gtk: limit virtual console max update interval, Gerd Hoffmann, 2021/01/15
- [PULL 04/11] ui/gtk: expose gd_monitor_update_interval, Gerd Hoffmann, 2021/01/15
- [PULL 10/11] vnc: move initialization to framebuffer_update_request, Gerd Hoffmann, 2021/01/15
- [PULL 07/11] ui: add support for remote power control to VNC server, Gerd Hoffmann, 2021/01/15
- [PULL 08/11] vnc: Fix a memleak in vnc_display_connect(), Gerd Hoffmann, 2021/01/15
- [PULL 05/11] ui/gtk: update monitor interval on egl displays, Gerd Hoffmann, 2021/01/15
- [PULL 11/11] vnc: add support for extended desktop resize, Gerd Hoffmann, 2021/01/15
- [PULL 06/11] vnc: fix unfinalized tlscreds for VncDisplay, Gerd Hoffmann, 2021/01/15
- [PULL 09/11] vnc: move check into vnc_cursor_define,
Gerd Hoffmann <=
- Re: [PULL 00/11] Ui 20210115 patches, Peter Maydell, 2021/01/15