ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ui: introduce enum to track VNC client framebuffer update request state 

Currently the VNC servers tracks whether a client has requested an incremental
or forced update with two boolean flags. There are only really 3 distinct
states to track, so create an enum to more accurately reflect permitted states.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Reviewed-by: Darren Kenny <darren.kenny@oracle.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-id: 20171218191228.31018-7-berrange@redhat.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Daniel P. Berrange 2017-12-18 19:12:21 +00:00 committed by Gerd Hoffmann
parent 8f61f1c5a6
commit fef1bbadfb
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ui/vnc.c
View File

@ -975,16 +975,17 @@ static int vnc_update_client(VncState *vs, int has_dirty)
} }
vs->has_dirty += has_dirty; vs->has_dirty += has_dirty;
if (!vs->need_update) { if (vs->update == VNC_STATE_UPDATE_NONE) {
return 0; return 0;
} }
if (vs->output.offset && !vs->audio_cap && !vs->force_update) { if (vs->output.offset && !vs->audio_cap &&
vs->update != VNC_STATE_UPDATE_FORCE) {
/* kernel send buffers are full -> drop frames to throttle */ /* kernel send buffers are full -> drop frames to throttle */
return 0; return 0;
} }
if (!vs->has_dirty && !vs->force_update) { if (!vs->has_dirty && vs->update != VNC_STATE_UPDATE_FORCE) {
return 0; return 0;
} }
@ -1030,7 +1031,7 @@ static int vnc_update_client(VncState *vs, int has_dirty)
} }
vnc_job_push(job); vnc_job_push(job);
vs->force_update = 0; vs->update = VNC_STATE_UPDATE_INCREMENTAL;
vs->has_dirty = 0; vs->has_dirty = 0;
return n; return n;
} }
@ -1869,14 +1870,14 @@ static void ext_key_event(VncState *vs, int down,
static void framebuffer_update_request(VncState *vs, int incremental, static void framebuffer_update_request(VncState *vs, int incremental,
int x, int y, int w, int h) int x, int y, int w, int h)
{ {
vs->need_update = 1;
if (incremental) { if (incremental) {
return; if (vs->update != VNC_STATE_UPDATE_FORCE) {
vs->update = VNC_STATE_UPDATE_INCREMENTAL;
} }
} else {
vs->force_update = 1; vs->update = VNC_STATE_UPDATE_FORCE;
vnc_set_area_dirty(vs->dirty, vs->vd, x, y, w, h); vnc_set_area_dirty(vs->dirty, vs->vd, x, y, w, h);
}
} }
static void send_ext_key_event_ack(VncState *vs) static void send_ext_key_event_ack(VncState *vs)

9
ui/vnc.h
View File

@ -252,6 +252,12 @@ struct VncJob
QTAILQ_ENTRY(VncJob) next; QTAILQ_ENTRY(VncJob) next;
}; };
typedef enum {
VNC_STATE_UPDATE_NONE,
VNC_STATE_UPDATE_INCREMENTAL,
VNC_STATE_UPDATE_FORCE,
} VncStateUpdate;
struct VncState struct VncState
{ {
QIOChannelSocket *sioc; /* The underlying socket */ QIOChannelSocket *sioc; /* The underlying socket */
@ -264,8 +270,7 @@ struct VncState
* vnc-jobs-async.c */ * vnc-jobs-async.c */
VncDisplay *vd; VncDisplay *vd;
int need_update; VncStateUpdate update; /* Most recent pending request from client */
int force_update;
int has_dirty; int has_dirty;
uint32_t features; uint32_t features;
int absolute; int absolute;