| Message ID | 1272889879-17563-2-git-send-email-corentincj@iksaif.net |
|---|---|
| State | New |
| Headers | show |
On 05/03/2010 07:31 AM, Corentin Chary wrote: > > From RFB specs: "The order of the encoding types given in this > message is a hint bby the client as to its preference (the first > encoding specified being most preferred)" > > Signed-off-by: Corentin Chary<corentincj@iksaif.net> > --- > vnc.c | 11 +++++++---- > 1 files changed, 7 insertions(+), 4 deletions(-) > > diff --git a/vnc.c b/vnc.c > index d332099..ad5b5af 100644 > --- a/vnc.c > +++ b/vnc.c > @@ -1767,7 +1767,7 @@ static void set_encodings(VncState *vs, int32_t *encodings, size_t n_encodings) > > vnc_zlib_init(vs); > vs->features = 0; > - vs->vnc_encoding = 0; > + vs->vnc_encoding = -1; > vs->tight_compression = 9; > vs->tight_quality = 9; > vs->absolute = -1; > @@ -1776,18 +1776,21 @@ static void set_encodings(VncState *vs, int32_t *encodings, size_t n_encodings) > enc = encodings[i]; > switch (enc) { > case VNC_ENCODING_RAW: > - vs->vnc_encoding = enc; > + if (vs->vnc_encoding != -1) > + vs->vnc_encoding = enc; > Need braces on the if statement (see CODING_STYLE) but otherwise, this patch makes sense. Regards, Anthony Liguori > break; > case VNC_ENCODING_COPYRECT: > vs->features |= VNC_FEATURE_COPYRECT_MASK; > break; > case VNC_ENCODING_HEXTILE: > vs->features |= VNC_FEATURE_HEXTILE_MASK; > - vs->vnc_encoding = enc; > + if (vs->vnc_encoding != -1) > + vs->vnc_encoding = enc; > break; > case VNC_ENCODING_ZLIB: > vs->features |= VNC_FEATURE_ZLIB_MASK; > - vs->vnc_encoding = enc; > + if (vs->vnc_encoding != -1) > + vs->vnc_encoding = enc; > break; > case VNC_ENCODING_DESKTOPRESIZE: > vs->features |= VNC_FEATURE_RESIZE_MASK; >
diff --git a/vnc.c b/vnc.c index d332099..ad5b5af 100644 --- a/vnc.c +++ b/vnc.c @@ -1767,7 +1767,7 @@ static void set_encodings(VncState *vs, int32_t *encodings, size_t n_encodings) vnc_zlib_init(vs); vs->features = 0; - vs->vnc_encoding = 0; + vs->vnc_encoding = -1; vs->tight_compression = 9; vs->tight_quality = 9; vs->absolute = -1; @@ -1776,18 +1776,21 @@ static void set_encodings(VncState *vs, int32_t *encodings, size_t n_encodings) enc = encodings[i]; switch (enc) { case VNC_ENCODING_RAW: - vs->vnc_encoding = enc; + if (vs->vnc_encoding != -1) + vs->vnc_encoding = enc; break; case VNC_ENCODING_COPYRECT: vs->features |= VNC_FEATURE_COPYRECT_MASK; break; case VNC_ENCODING_HEXTILE: vs->features |= VNC_FEATURE_HEXTILE_MASK; - vs->vnc_encoding = enc; + if (vs->vnc_encoding != -1) + vs->vnc_encoding = enc; break; case VNC_ENCODING_ZLIB: vs->features |= VNC_FEATURE_ZLIB_MASK; - vs->vnc_encoding = enc; + if (vs->vnc_encoding != -1) + vs->vnc_encoding = enc; break; case VNC_ENCODING_DESKTOPRESIZE: vs->features |= VNC_FEATURE_RESIZE_MASK;
From RFB specs: "The order of the encoding types given in this message is a hint bby the client as to its preference (the first encoding specified being most preferred)" Signed-off-by: Corentin Chary <corentincj@iksaif.net> --- vnc.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-)