| Message ID | 1272974518-20144-1-git-send-email-corentincj@iksaif.net |
|---|---|
| State | New |
| Headers | show |
On Tue, May 4, 2010 at 2:01 PM, Corentin Chary <corentincj@iksaif.net> wrote: > From RFB specs: "The order of the encoding types given in this > message is a hint by the client as to its preference (the first > encoding specified being most preferred)" > > Signed-off-by: Corentin Chary <corentincj@iksaif.net> > --- > vnc.c | 14 ++++++++++---- > 1 files changed, 10 insertions(+), 4 deletions(-) > > diff --git a/vnc.c b/vnc.c > index 5241a6a..2d05d8f 100644 > --- a/vnc.c > +++ b/vnc.c > @@ -1594,7 +1594,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; > @@ -1603,18 +1603,24 @@ 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; > + } hum patch is broken, sending a fixed patch today, sorry should be if (vs->vnc_encoding == -1)
diff --git a/vnc.c b/vnc.c index 5241a6a..2d05d8f 100644 --- a/vnc.c +++ b/vnc.c @@ -1594,7 +1594,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; @@ -1603,18 +1603,24 @@ 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 by the client as to its preference (the first encoding specified being most preferred)" Signed-off-by: Corentin Chary <corentincj@iksaif.net> --- vnc.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-)