Commit fef1bbad authored by Daniel P. Berrangé's avatar Daniel P. Berrangé Committed by Gerd Hoffmann
Browse files

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: default avatarDaniel P. Berrange <berrange@redhat.com>
Reviewed-by: default avatarDarren Kenny <darren.kenny@oracle.com>
Reviewed-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Message-id: 20171218191228.31018-7-berrange@redhat.com
Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent 8f61f1c5

ui/vnc.c

+11 −10
Original line number Diff line number Diff line
@@ -975,16 +975,17 @@ static int vnc_update_client(VncState *vs, int has_dirty) 
    }



    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;

    }
@@ -1030,7 +1031,7 @@ static int vnc_update_client(VncState *vs, int has_dirty) 
    }



    vnc_job_push(job);

    vs->force_update = 0;

    vs->update = VNC_STATE_UPDATE_INCREMENTAL;

    vs->has_dirty = 0;

    return n;

}
@@ -1869,15 +1870,15 @@ static void ext_key_event(VncState *vs, int down, 
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;

        }



    vs->force_update = 1;

    } else {

        vs->update = VNC_STATE_UPDATE_FORCE;

        vnc_set_area_dirty(vs->dirty, vs->vd, x, y, w, h);

    }

}



static void send_ext_key_event_ack(VncState *vs)

{

ui/vnc.h

+7 −2
Original line number Diff line number Diff line
@@ -252,6 +252,12 @@ struct VncJob 
    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 */
@@ -264,8 +270,7 @@ struct VncState 
                           * 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;