}
vs->has_dirty += has_dirty;
- if (!vs->need_update) {
+ if (vs->update == VNC_STATE_UPDATE_NONE) {
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 */
return 0;
}
- if (!vs->has_dirty && !vs->force_update) {
+ if (!vs->has_dirty && vs->update != VNC_STATE_UPDATE_FORCE) {
return 0;
}
}
vnc_job_push(job);
- vs->force_update = 0;
+ vs->update = VNC_STATE_UPDATE_INCREMENTAL;
vs->has_dirty = 0;
return n;
}
static void framebuffer_update_request(VncState *vs, int incremental,
int x, int y, int w, int h)
{
- vs->need_update = 1;
-
if (incremental) {
- return;
+ if (vs->update != VNC_STATE_UPDATE_FORCE) {
+ vs->update = VNC_STATE_UPDATE_INCREMENTAL;
+ }
+ } else {
+ vs->update = VNC_STATE_UPDATE_FORCE;
+ vnc_set_area_dirty(vs->dirty, vs->vd, x, y, w, h);
}
-
- vs->force_update = 1;
- vnc_set_area_dirty(vs->dirty, vs->vd, x, y, w, h);
}
static void send_ext_key_event_ack(VncState *vs)
QTAILQ_ENTRY(VncJob) next;
};
+typedef enum {
+ VNC_STATE_UPDATE_NONE,
+ VNC_STATE_UPDATE_INCREMENTAL,
+ VNC_STATE_UPDATE_FORCE,
+} VncStateUpdate;
+
struct VncState
{
QIOChannelSocket *sioc; /* The underlying socket */
* vnc-jobs-async.c */
VncDisplay *vd;
- int need_update;
- int force_update;
+ VncStateUpdate update; /* Most recent pending request from client */
int has_dirty;
uint32_t features;
int absolute;